Extended: Add "system" URLRequestContext

chrome/browser/net/chrome_url_request_context.cc

 // Copyright (c) 2011 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 "chrome/browser/net/chrome_url_request_context.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager_backend.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h"
 #include "chrome/browser/net/sqlite_persistent_cookie_store.h"
 #include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/net/pref_proxy_config_service.h"
+#include "chrome/browser/net/proxy_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "net/base/static_cookie_policy.h"
 #include "net/ftp/ftp_network_layer.h"
@@ skipping 28 matching lines @@
 
 void CheckCurrentlyOnMainThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 // ----------------------------------------------------------------------------
 // Helper methods to initialize proxy
 // ----------------------------------------------------------------------------
 
 net::ProxyConfigService* CreateProxyConfigService(Profile* profile) {
-  // The linux gconf-based proxy settings getter relies on being initialized
-  // from the UI thread.
-  CheckCurrentlyOnMainThread();
-
-  // Create a baseline service that provides proxy configuration in case nothing
-  // is configured through prefs (Note: prefs include command line and
-  // configuration policy).
-  net::ProxyConfigService* base_service = NULL;
-
-  // TODO(port): the IO and FILE message loops are only used by Linux.  Can
-  // that code be moved to chrome/browser instead of being in net, so that it
-  // can use BrowserThread instead of raw MessageLoop pointers? See bug 25354.
-#if defined(OS_CHROMEOS)
-  base_service = new chromeos::ProxyConfigService(
-      profile->GetChromeOSProxyConfigServiceImpl());
-#else
-  base_service = net::ProxyService::CreateSystemProxyConfigService(
+  return ProxyServiceFactory::CreateProxyConfigService(
       g_browser_process->io_thread()->message_loop(),
-      g_browser_process->file_thread()->message_loop());
-#endif  // defined(OS_CHROMEOS)
-
-  return new PrefProxyConfigService(profile->GetProxyConfigTracker(),
-                                    base_service);
+      g_browser_process->file_thread()->message_loop(),
+      profile->GetProxyConfigTracker());
 }
 
 // Create a proxy service according to the options on command line.
 net::ProxyService* CreateProxyService(
     net::NetLog* net_log,
     net::URLRequestContext* context,
     net::ProxyConfigService* proxy_config_service,
     const CommandLine& command_line) {
   CheckCurrentlyOnIOThread();
 
@@ skipping 163 matching lines @@
   IOThread::Globals* io_thread_globals = io_thread()->globals();
   const ProfileIOData::LazyParams& params = profile_io_data_->lazy_params();
 
   context->set_dns_cert_checker(
       CreateDnsCertProvenanceChecker(io_thread_globals->dnsrr_resolver.get(),
                                      context));
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
   context->set_proxy_service(
-      CreateProxyService(io_thread()->net_log(),
-                         io_thread_globals->proxy_script_fetcher_context.get(),
-                         proxy_config_service_.release(),
-                         command_line));
+      ProxyServiceFactory::CreateProxyService(
+          io_thread()->net_log(),
+          io_thread_globals->proxy_script_fetcher_context.get(),
+          proxy_config_service_.release(),
+          command_line));
 
   net::HttpCache::DefaultBackend* backend = new net::HttpCache::DefaultBackend(
       net::DISK_CACHE, params.cache_path, params.cache_max_size,
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE));
   net::HttpCache* cache = new net::HttpCache(
       context->host_resolver(),
       context->cert_verifier(),
       context->dnsrr_resolver(),
       context->dns_cert_checker(),
       context->proxy_service(),
@@ skipping 115 matching lines @@
 
   IOThread::Globals* io_thread_globals = io_thread()->globals();
   context->set_host_resolver(io_thread_globals->host_resolver.get());
   context->set_cert_verifier(io_thread_globals->cert_verifier.get());
   context->set_http_auth_handler_factory(
       io_thread_globals->http_auth_handler_factory.get());
   context->set_network_delegate(&io_thread_globals->network_delegate);
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   context->set_proxy_service(
-      CreateProxyService(io_thread()->net_log(),
-                         io_thread_globals->proxy_script_fetcher_context.get(),
-                         proxy_config_service_.release(),
-                         command_line));
+      ProxyServiceFactory::CreateProxyService(
+          io_thread()->net_log(),
+          io_thread_globals->proxy_script_fetcher_context.get(),
+          proxy_config_service_.release(),
+          command_line));
 
   net::HttpCache::BackendFactory* backend =
       net::HttpCache::DefaultBackend::InMemory(0);
 
   net::HttpCache* cache =
       new net::HttpCache(io_thread_globals->host_resolver.get(),
                          io_thread_globals->cert_verifier.get(),
                          context->dnsrr_resolver(),
                          NULL /* dns_cert_checker */,
                          context->proxy_service(),
@@ skipping 441 matching lines @@
       transport_security_state_);
   context->set_ssl_config_service(ssl_config_service_);
   context->set_appcache_service(appcache_service_);
   context->set_database_tracker(database_tracker_);
   context->set_blob_storage_context(blob_storage_context_);
   context->set_file_system_context(file_system_context_);
   context->set_extension_info_map(extension_info_map_);
   context->set_extension_io_event_router(extension_io_event_router_);
   context->set_prerender_manager(prerender_manager_);
 }