Extended: Add "system" URLRequestContext

chrome/browser/browser_process_impl.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/browser_process_impl.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 16 matching lines @@
 #include "chrome/browser/download/download_file_manager.h"
 #include "chrome/browser/download/save_file_manager.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/intranet_redirect_detector.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/net/chrome_net_log.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/net/sdch_dictionary_fetcher.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/plugin_data_remover.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/plugin_updater.h"
 #include "chrome/browser/policy/configuration_policy_provider_keeper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/safe_browsing/client_side_detection_service.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/sidebar/sidebar_manager.h"
 #include "chrome/browser/tab_closeable_state_watcher.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/json_pref_store.h"
+#include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/switch_utils.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "ipc/ipc_logging.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "webkit/database/database_tracker.h"
 
@@ skipping 122 matching lines @@
   configuration_policy_provider_keeper_.reset();
 
 #if defined(USE_X11)
   // The IO thread must outlive the BACKGROUND_X11 thread.
   background_x11_thread_.reset();
 #endif
 
   // Wait for removing plugin data to finish before shutting down the IO thread.
   WaitForPluginDataRemoverToFinish();
 
+  // Give up reference before io_thread_ checks that there is no one left
+  // holding a reference.
+  system_request_context_ = NULL;
+
   // Need to stop io_thread_ before resource_dispatcher_host_, since
   // io_thread_ may still deref ResourceDispatcherHost and handle resource
   // request before going away.
   io_thread_.reset();
 
   // The IO thread was the only user of this thread.
   cache_thread_.reset();
 
   // Stop the process launcher thread after the IO thread, in case the IO thread
   // posted a task to terminate a process on the process launcher thread.
@@ skipping 26 matching lines @@
   // former registers for notifications.
   tab_closeable_state_watcher_.reset();
 
   // Now OK to destroy NotificationService.
   main_notification_service_.reset();
 
   // Prior to clearing local state, we want to complete tasks pending
   // on the db thread too.
   db_thread_.reset();
 
+  // Need to destroy PrefProxyConfigTracker before local state, since it
+  // caches a pointer to local state.
+  if (pref_proxy_config_tracker_)
+    pref_proxy_config_tracker_->DetachFromPrefService();
+  pref_proxy_config_tracker_ = NULL;
+
   // At this point, no render process exist and the file, io, db, and
   // webkit threads in this process have all terminated, so it's safe
   // to access local state data such as cookies, database, or local storage.
   if (clear_local_state_on_exit)
     ClearLocalState(profile_path);
 
   g_browser_process = NULL;
 }
 
 #if defined(OS_WIN)
@@ skipping 158 matching lines @@
   if (!created_sidebar_manager_)
     CreateSidebarManager();
   return sidebar_manager_.get();
 }
 
 ui::Clipboard* BrowserProcessImpl::clipboard() {
   DCHECK(CalledOnValidThread());
   return clipboard_.get();
 }
 
+PrefProxyConfigTracker* BrowserProcessImpl::pref_proxy_config_tracker() {
+  DCHECK(CalledOnValidThread());
+  if (!created_pref_proxy_config_tracker_)
+    CreatePrefProxyConfigTracker();
+  return pref_proxy_config_tracker_.get();
+}
+
+scoped_refptr<URLRequestContextGetter>
+    BrowserProcessImpl::system_request_context() {
+  DCHECK(CalledOnValidThread());
+  if (!created_system_request_context_)
+    CreateSystemRequestContextGetter();
+  return system_request_context_.get();
+}
+
 NotificationUIManager* BrowserProcessImpl::notification_ui_manager() {
   DCHECK(CalledOnValidThread());
   if (!created_notification_ui_manager_)
     CreateNotificationUIManager();
   return notification_ui_manager_.get();
 }
 
 policy::ConfigurationPolicyProviderKeeper*
     BrowserProcessImpl::configuration_policy_provider_keeper() {
   DCHECK(CalledOnValidThread());
@@ skipping 390 matching lines @@
   if (IsSafeBrowsingDetectionServiceEnabled() &&
       PathService::Get(chrome::DIR_USER_DATA, &model_file_path) &&
       profile && profile->GetRequestContext()) {
     safe_browsing_detection_service_.reset(
         safe_browsing::ClientSideDetectionService::Create(
             model_file_path.Append(chrome::kSafeBrowsingPhishingModelFilename),
             profile->GetRequestContext()));
   }
 }
 
+void BrowserProcessImpl::CreatePrefProxyConfigTracker() {
+  DCHECK(pref_proxy_config_tracker_.get() == NULL);
+  created_pref_proxy_config_tracker_ = true;
+  pref_proxy_config_tracker_ = new PrefProxyConfigTracker(local_state());
+}
+
+void BrowserProcessImpl::CreateSystemRequestContextGetter() {
+  DCHECK(system_request_context_.get() == NULL);
+  created_system_request_context_ = true;
+
+  net::ProxyConfigService* config_service =

[willchan no longer on Chromium, 2011/02/16 20:02:27]

There's also a SSLConfigService, so can you name this variable
proxy_config_service?

[battre, 2011/02/21 17:27:57]

Done.

+      ProxyServiceFactory::CreateProxyConfigService(
+          io_thread()->message_loop(), file_thread()->message_loop(),
+          pref_proxy_config_tracker());
+
+  // Takes ownership of config_service.
+  io_thread()->SetSystemProxyConfigService(config_service);
+
+  system_request_context_ = io_thread()->system_url_request_context_getter();

[willchan no longer on Chromium, 2011/02/16 20:02:27]

Don't cache the pointer here. We want the IOThread::Globals to hold the last
reference.

You should probably change the above assertion to be
DCHECK(!created_system_request_context_). Then just call
io_thread()->system_url_request_context_getter() to initialize it.

[battre, 2011/02/21 17:27:57]

Done.

+}
+
 bool BrowserProcessImpl::IsSafeBrowsingDetectionServiceEnabled() {
   // The safe browsing client-side detection is enabled only if the switch is
   // enabled and when safe browsing related stats is allowed to be collected.
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableClientSidePhishingDetection) &&
       resource_dispatcher_host()->safe_browsing_service() &&
       resource_dispatcher_host()->safe_browsing_service()->CanReportStats();
 }
 
 // The BrowserProcess object must outlive the file thread so we use traits
@@ skipping 101 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartPersistentInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)