Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Unified Diff: extensions/browser/extension_url_request_context_getter.cc

Issue 631203003: Fix bug: AppShell: CHECK failure in PeerConnection init. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase again. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/browser/extension_url_request_context_getter.h ('k') | extensions/common/switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/extension_url_request_context_getter.cc
diff --git a/extensions/browser/extension_url_request_context_getter.cc b/extensions/browser/extension_url_request_context_getter.cc
deleted file mode 100644
index 78826d119a220b6ea6e9a62330a14e4fe1c2ef42..0000000000000000000000000000000000000000
--- a/extensions/browser/extension_url_request_context_getter.cc
+++ /dev/null
@@ -1,250 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "extensions/browser/extension_url_request_context_getter.h"
-
-#include "base/command_line.h"
-#include "base/logging.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/strings/string_split.h"
-#include "base/strings/string_util.h"
-#include "base/threading/sequenced_worker_pool.h"
-#include "base/threading/worker_pool.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/cookie_store_factory.h"
-#include "content/public/browser/resource_request_info.h"
-#include "content/public/common/content_switches.h"
-#include "extensions/browser/extension_network_delegate.h"
-#include "extensions/browser/info_map.h"
-#include "extensions/common/constants.h"
-#include "extensions/common/switches.h"
-#include "net/base/cache_type.h"
-#include "net/cert/cert_verifier.h"
-#include "net/cookies/cookie_monster.h"
-#include "net/dns/host_resolver.h"
-#include "net/dns/mapped_host_resolver.h"
-#include "net/http/http_auth_handler_factory.h"
-#include "net/http/http_cache.h"
-#include "net/http/http_network_session.h"
-#include "net/http/http_server_properties_impl.h"
-#include "net/http/transport_security_state.h"
-#include "net/proxy/proxy_service.h"
-#include "net/ssl/channel_id_service.h"
-#include "net/ssl/default_channel_id_store.h"
-#include "net/ssl/ssl_config_service_defaults.h"
-#include "net/url_request/data_protocol_handler.h"
-#include "net/url_request/file_protocol_handler.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"
-#include "net/url_request/url_request_intercepting_job_factory.h"
-#include "net/url_request/url_request_job_factory_impl.h"
-#include "url/url_constants.h"
-
-namespace extensions {
-
-namespace {
-void InstallProtocolHandlers(net::URLRequestJobFactoryImpl* job_factory,
- content::ProtocolHandlerMap* protocol_handlers) {
- for (content::ProtocolHandlerMap::iterator it =
- protocol_handlers->begin();
- it != protocol_handlers->end();
- ++it) {
- bool set_protocol = job_factory->SetProtocolHandler(
- it->first, it->second.release());
- DCHECK(set_protocol);
- }
- protocol_handlers->clear();
-}
-
-} // namespace
-
-ExtensionURLRequestContextGetter::ExtensionURLRequestContextGetter(
- void* browser_context,
- bool ignore_certificate_errors,
- const base::FilePath& base_path,
- base::MessageLoop* io_loop,
- base::MessageLoop* file_loop,
- content::ProtocolHandlerMap* protocol_handlers,
- content::URLRequestInterceptorScopedVector request_interceptors,
- net::NetLog* net_log,
- InfoMap* extension_info_map)
- : browser_context_(browser_context),
- ignore_certificate_errors_(ignore_certificate_errors),
- base_path_(base_path),
- io_loop_(io_loop),
- file_loop_(file_loop),
- net_log_(net_log),
- extension_info_map_(extension_info_map),
- request_interceptors_(request_interceptors.Pass()) {
- // Must first be created on the UI thread.
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
- std::swap(protocol_handlers_, *protocol_handlers);
-
- // We must create the proxy config service on the UI loop on Linux because it
- // must synchronously run on the glib message loop. This will be passed to
- // the URLRequestContextStorage on the IO thread in GetURLRequestContext().
- if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
- proxy_config_service_.reset(
- net::ProxyService::CreateSystemProxyConfigService(
- io_loop_->message_loop_proxy(), file_loop_->message_loop_proxy()));
- }
-}
-
-ExtensionURLRequestContextGetter::~ExtensionURLRequestContextGetter() {
-}
-
-net::URLRequestContext*
-ExtensionURLRequestContextGetter::GetURLRequestContext() {
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-
- if (!url_request_context_) {
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-
- url_request_context_.reset(new net::URLRequestContext());
- url_request_context_->set_net_log(net_log_);
- network_delegate_.reset(
- new ExtensionNetworkDelegate(browser_context_, extension_info_map_));
- if (command_line.HasSwitch(switches::kDumpRenderTree))
- ExtensionNetworkDelegate::SetAcceptAllCookies(false);
- url_request_context_->set_network_delegate(network_delegate_.get());
- storage_.reset(
- new net::URLRequestContextStorage(url_request_context_.get()));
- storage_->set_cookie_store(CreateCookieStore(content::CookieStoreConfig()));
- storage_->set_channel_id_service(new net::ChannelIDService(
- new net::DefaultChannelIDStore(NULL),
- base::WorkerPool::GetTaskRunner(true)));
-
- scoped_ptr<net::HostResolver> host_resolver(
- net::HostResolver::CreateDefaultResolver(
- url_request_context_->net_log()));
-
- storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
- storage_->set_transport_security_state(new net::TransportSecurityState);
- if (command_line.HasSwitch(switches::kDumpRenderTree)) {
- storage_->set_proxy_service(net::ProxyService::CreateDirect());
- } else {
- // TODO(jam): use v8 if possible, look at chrome code.
- storage_->set_proxy_service(
- net::ProxyService::CreateUsingSystemProxyResolver(
- proxy_config_service_.release(),
- 0,
- url_request_context_->net_log()));
- }
- storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults);
- storage_->set_http_auth_handler_factory(
- net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get()));
- storage_->set_http_server_properties(
- scoped_ptr<net::HttpServerProperties>(
- new net::HttpServerPropertiesImpl()));
-
- base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache"));
- net::HttpCache::DefaultBackend* main_backend =
- new net::HttpCache::DefaultBackend(
- net::DISK_CACHE,
-#if defined(OS_ANDROID)
- // TODO(rdsmith): Remove when default backend for Android is
- // changed to simple cache.
- net::CACHE_BACKEND_SIMPLE,
-#else
- net::CACHE_BACKEND_DEFAULT,
-#endif
- cache_path,
- 0,
- content::BrowserThread::GetMessageLoopProxyForThread(
- content::BrowserThread::CACHE));
-
- net::HttpNetworkSession::Params network_session_params;
- network_session_params.cert_verifier =
- url_request_context_->cert_verifier();
- network_session_params.transport_security_state =
- url_request_context_->transport_security_state();
- network_session_params.channel_id_service =
- url_request_context_->channel_id_service();
- network_session_params.proxy_service =
- url_request_context_->proxy_service();
- network_session_params.ssl_config_service =
- url_request_context_->ssl_config_service();
- network_session_params.http_auth_handler_factory =
- url_request_context_->http_auth_handler_factory();
- network_session_params.network_delegate =
- network_delegate_.get();
- network_session_params.http_server_properties =
- url_request_context_->http_server_properties();
- network_session_params.net_log =
- url_request_context_->net_log();
- network_session_params.ignore_certificate_errors =
- ignore_certificate_errors_;
- if (command_line.HasSwitch(::switches::kTestingFixedHttpPort)) {
- int value;
- base::StringToInt(command_line.GetSwitchValueASCII(
- ::switches::kTestingFixedHttpPort), &value);
- network_session_params.testing_fixed_http_port = value;
- }
- if (command_line.HasSwitch(::switches::kTestingFixedHttpsPort)) {
- int value;
- base::StringToInt(command_line.GetSwitchValueASCII(
- ::switches::kTestingFixedHttpsPort), &value);
- network_session_params.testing_fixed_https_port = value;
- }
- if (command_line.HasSwitch(::switches::kHostResolverRules)) {
- scoped_ptr<net::MappedHostResolver> mapped_host_resolver(
- new net::MappedHostResolver(host_resolver.Pass()));
- mapped_host_resolver->SetRulesFromString(
- command_line.GetSwitchValueASCII(::switches::kHostResolverRules));
- host_resolver = mapped_host_resolver.Pass();
- }
-
- // Give |storage_| ownership at the end in case it's |mapped_host_resolver|.
- storage_->set_host_resolver(host_resolver.Pass());
- network_session_params.host_resolver =
- url_request_context_->host_resolver();
-
- net::HttpCache* main_cache = new net::HttpCache(
- network_session_params, main_backend);
- storage_->set_http_transaction_factory(main_cache);
-
- scoped_ptr<net::URLRequestJobFactoryImpl> job_factory(
- new net::URLRequestJobFactoryImpl());
- // Keep ProtocolHandlers added in sync with
- // ShellContentBrowserClient::IsHandledURL().
- InstallProtocolHandlers(job_factory.get(), &protocol_handlers_);
- bool set_protocol = job_factory->SetProtocolHandler(
- url::kDataScheme, new net::DataProtocolHandler);
- DCHECK(set_protocol);
-#if !defined(DISABLE_FILE_SUPPORT)
- set_protocol = job_factory->SetProtocolHandler(
- url::kFileScheme,
- new net::FileProtocolHandler(
- content::BrowserThread::GetBlockingPool()->
- GetTaskRunnerWithShutdownBehavior(
- base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)));
- DCHECK(set_protocol);
-#endif
-
- // Set up interceptors in the reverse order.
- scoped_ptr<net::URLRequestJobFactory> top_job_factory =
- job_factory.PassAs<net::URLRequestJobFactory>();
- for (content::URLRequestInterceptorScopedVector::reverse_iterator i =
- request_interceptors_.rbegin();
- i != request_interceptors_.rend();
- ++i) {
- top_job_factory.reset(new net::URLRequestInterceptingJobFactory(
- top_job_factory.Pass(), make_scoped_ptr(*i)));
- }
- request_interceptors_.weak_clear();
-
- storage_->set_job_factory(top_job_factory.release());
- }
-
- return url_request_context_.get();
-}
-
-scoped_refptr<base::SingleThreadTaskRunner>
- ExtensionURLRequestContextGetter::GetNetworkTaskRunner() const {
- return content::BrowserThread::GetMessageLoopProxyForThread(
- content::BrowserThread::IO);
-}
-
-} // namespace extensions
« no previous file with comments | « extensions/browser/extension_url_request_context_getter.h ('k') | extensions/common/switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698