diff --git a/brightray/browser/browser_context.cc b/brightray/browser/browser_context.cc index 1b06fe0b1cf5..2747ad9f7814 100644 --- a/brightray/browser/browser_context.cc +++ b/brightray/browser/browser_context.cc @@ -11,7 +11,6 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/resource_context.h" #include "content/public/browser/storage_partition.h" -#include "net/base/host_resolver.h" #include "url_request_context_getter.h" namespace brightray { @@ -34,7 +33,6 @@ private: } URLRequestContextGetter* getter_; - scoped_ptr host_resolver_; }; BrowserContext::BrowserContext() : resource_context_(new ResourceContext) { diff --git a/brightray/browser/devtools_delegate.cc b/brightray/browser/devtools_delegate.cc index 3542a6da6948..ed9f9a47b8ac 100644 --- a/brightray/browser/devtools_delegate.cc +++ b/brightray/browser/devtools_delegate.cc @@ -36,4 +36,8 @@ content::DevToolsHttpHandlerDelegate::TargetType DevToolsDelegate::GetTargetType return kTargetTypeTab; } +std::string DevToolsDelegate::GetViewDescription(content::RenderViewHost*) { + return std::string(); +} + } diff --git a/brightray/browser/devtools_delegate.h b/brightray/browser/devtools_delegate.h index e237222c4c1c..3fb345e2ebec 100644 --- a/brightray/browser/devtools_delegate.h +++ b/brightray/browser/devtools_delegate.h @@ -21,6 +21,7 @@ private: virtual std::string GetPageThumbnailData(const GURL&) OVERRIDE; virtual content::RenderViewHost* CreateNewTarget() OVERRIDE; virtual TargetType GetTargetType(content::RenderViewHost*) OVERRIDE; + virtual std::string GetViewDescription(content::RenderViewHost*) OVERRIDE; }; } diff --git a/brightray/browser/devtools_frontend.cc b/brightray/browser/devtools_frontend.cc index 097e28c9ff19..b8a9004b628a 100644 --- a/brightray/browser/devtools_frontend.cc +++ b/brightray/browser/devtools_frontend.cc @@ -25,7 +25,7 @@ content::WebContents* DevToolsFrontend::Show(content::WebContents* inspected_con DevToolsFrontend::DevToolsFrontend(content::WebContents* inspected_contents) : WebContentsObserver(content::WebContents::Create(content::WebContents::CreateParams(inspected_contents->GetBrowserContext()))), inspected_web_contents_(inspected_contents), - agent_host_(content::DevToolsAgentHost::GetFor(inspected_contents->GetRenderViewHost())), + agent_host_(content::DevToolsAgentHost::GetOrCreateFor(inspected_contents->GetRenderViewHost())), frontend_host_(content::DevToolsClientHost::CreateDevToolsFrontendHost(web_contents(), this)) { web_contents()->SetDelegate(this); auto client = static_cast(content::GetContentClient()->browser()); diff --git a/brightray/browser/url_request_context_getter.cc b/brightray/browser/url_request_context_getter.cc index 137d6a90f8a9..e865f8ce2244 100644 --- a/brightray/browser/url_request_context_getter.cc +++ b/brightray/browser/url_request_context_getter.cc @@ -10,14 +10,14 @@ #include "content/public/browser/browser_thread.h" #include "content/public/common/url_constants.h" #include "net/base/cert_verifier.h" -#include "net/base/default_server_bound_cert_store.h" -#include "net/base/server_bound_cert_service.h" -#include "net/base/ssl_config_service_defaults.h" #include "net/cookies/cookie_monster.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" #include "net/http/http_server_properties_impl.h" #include "net/proxy/proxy_service.h" +#include "net/ssl/default_server_bound_cert_store.h" +#include "net/ssl/server_bound_cert_service.h" +#include "net/ssl/ssl_config_service_defaults.h" #include "net/url_request/static_http_user_agent_settings.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_storage.h" @@ -64,7 +64,7 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() base::WorkerPool::GetTaskRunner(true))); storage_->set_http_user_agent_settings( new net::StaticHttpUserAgentSettings( - "en-us,en", "iso-8859-1,*,utf-8", EmptyString())); + "en-us,en", EmptyString())); scoped_ptr host_resolver( net::HostResolver::CreateDefaultResolver(NULL)); diff --git a/brightray/vendor/libchromiumcontent b/brightray/vendor/libchromiumcontent index 3f6f01c46be6..8a81d74a5671 160000 --- a/brightray/vendor/libchromiumcontent +++ b/brightray/vendor/libchromiumcontent @@ -1 +1 @@ -Subproject commit 3f6f01c46be61f36b4e25456bf2c0539ef4d77f3 +Subproject commit 8a81d74a56712c112cad1956fdd8ed836532a378