Use IOThread::Globals where possible in ChromeURLRequestContext.

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"
@@ skipping 379 matching lines @@
 
  private:
   scoped_ptr<net::ProxyConfigService> proxy_config_service_;
   scoped_refptr<ChromeURLRequestContextGetter> original_context_getter_;
 };
 
 ChromeURLRequestContext* FactoryForOffTheRecord::Create() {
   ChromeURLRequestContext* context = new ChromeURLRequestContext;
   ApplyProfileParametersToContext(context);
 
-  ChromeURLRequestContext* original_context =
-      original_context_getter_->GetIOContext();
+  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());
 
-  IOThread::Globals* io_thread_globals = io_thread()->globals();
-
-  // Share the same proxy service, host resolver, cert verifier,
-  // and http_auth_handler_factory as the original profile.
-  context->set_host_resolver(original_context->host_resolver());
-  context->set_cert_verifier(original_context->cert_verifier());
   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));
-  context->set_http_auth_handler_factory(
-      original_context->http_auth_handler_factory());
 
   net::HttpCache::BackendFactory* backend =
       net::HttpCache::DefaultBackend::InMemory(0);
 
   net::HttpCache* cache =
       new net::HttpCache(context->host_resolver(),
                          context->cert_verifier(),
                          context->dnsrr_resolver(),
                          NULL /* dns_cert_checker */,
                          context->proxy_service(),
@@ skipping 43 matching lines @@
 };
 
 ChromeURLRequestContext* FactoryForMedia::Create() {
   ChromeURLRequestContext* context = new ChromeURLRequestContext;
   ApplyProfileParametersToContext(context);
 
   ChromeURLRequestContext* main_context =
       main_context_getter_->GetIOContext();
 
   IOThread::Globals* io_thread_globals = io_thread()->globals();
+  context->set_http_auth_handler_factory(
+      io_thread_globals->http_auth_handler_factory.get());
 
-  // Share the same proxy service of the common profile.
+  // TODO(willchan): Make a global ProxyService available in IOThread::Globals.
   context->set_proxy_service(main_context->proxy_service());
-  context->set_http_auth_handler_factory(
-      main_context->http_auth_handler_factory());
 
   // Also share the cookie store of the common profile.
   context->set_cookie_store(main_context->cookie_store());
   context->set_cookie_policy(
       static_cast<ChromeCookiePolicy*>(main_context->cookie_policy()));
 
   // Create a media cache with default size.
   // TODO(hclam): make the maximum size of media cache configurable.
   net::HttpCache::DefaultBackend* backend = new net::HttpCache::DefaultBackend(
       net::MEDIA_CACHE, disk_cache_path_, cache_size_,
@@ skipping 10 matching lines @@
     // HttpCache(HttpTransactionFactory*, BackendFactory*) constructor.
     net::HttpNetworkLayer* main_network_layer =
         static_cast<net::HttpNetworkLayer*>(main_cache->network_layer());
     cache = new net::HttpCache(main_network_layer->GetSession(), backend);
     // TODO(eroman): Since this is poaching the session from the main
     // context, it should hold a reference to that context preventing the
     // session from getting deleted.
   } else {
     // If original HttpCache doesn't exist, simply construct one with a whole
     // new set of network stack.
-    cache = new net::HttpCache(main_context->host_resolver(),
-                               main_context->cert_verifier(),
-                               main_context->dnsrr_resolver(),
-                               NULL /* dns_cert_checker */,
-                               main_context->proxy_service(),
-                               main_context->ssl_config_service(),
-                               main_context->http_auth_handler_factory(),
-                               &io_thread_globals->network_delegate,
-                               io_thread()->net_log(),
-                               backend);
+    cache = new net::HttpCache(
+        io_thread_globals->host_resolver.get(),
+        io_thread_globals->cert_verifier.get(),
+        io_thread_globals->dnsrr_resolver.get(),
+        NULL /* dns_cert_checker */,
+        main_context->proxy_service(),
+        main_context->ssl_config_service(),
+        io_thread_globals->http_auth_handler_factory.get(),
+        &io_thread_globals->network_delegate,
+        io_thread()->net_log(),
+        backend);
   }
 
   context->set_http_transaction_factory(cache);
   context->set_net_log(io_thread()->net_log());
 
   return context;
 }
 
 }  // namespace
 
@@ skipping 376 matching lines @@
   context->set_transport_security_state(
       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_prerender_manager(prerender_manager_);
 }