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 12 matching lines @@
 static const int kUpdateCheckIntervalHours = 6;
 #endif
 
 #if defined(USE_X11)
 // How long to wait for the File thread to complete during EndSession, on
 // Linux. We have a timeout here because we're unable to run the UI messageloop
 // and there's some deadlock risk. Our only option is to exit anyway.
 static const int kEndSessionTimeoutSeconds = 10;
 #endif
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/proxy_config_service.h"

[kuan, 2011/02/18 16:29:31]

any reason why u need this file instead of just proxy_config_service_impl.h?

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

Done.

+#endif  // defined(OS_CHROMEOS)
+
 BrowserProcessImpl::BrowserProcessImpl(const CommandLine& command_line)
     : created_resource_dispatcher_host_(false),
       created_metrics_service_(false),
       created_io_thread_(false),
       created_file_thread_(false),
       created_db_thread_(false),
       created_process_launcher_thread_(false),
       created_cache_thread_(false),
       created_profile_manager_(false),
       created_local_state_(false),
@@ skipping 136 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 io_thread()->system_url_request_context_getter();
+}
+
+#if defined(OS_CHROMEOS)
+chromeos::ProxyConfigServiceImpl*
+BrowserProcessImpl::chromeos_proxy_config_service_impl() {
+  if (!chromeos_proxy_config_service_impl_) {
+    chromeos_proxy_config_service_impl_ =
+        new chromeos::ProxyConfigServiceImpl();
+  }
+  return chromeos_proxy_config_service_impl_;
+}
+#endif  // defined(OS_CHROMEOS)
+
 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() {

[brettw, 2011/02/21 06:22:47]

It's not clear to me why this code is in the BrowserProcess object? It seems
kine of weird that it would handle the lazy creation of something in another
class without storing any local state (I realize in a previous version you did
cache this). Should this code live in the IO thread? (I'm not actually sure, I'm
interested in others' opinions.)

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

Thanks for nagging. This simplified things significantly. The only cost is that
I need to store a local_state pointer in IOThread. But I think this is ok,
because it local_state outlives the IOThread.

+  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(!created_system_request_context_);
+  created_system_request_context_ = true;
+
+  net::ProxyConfigService* proxy_config_service =
+      ProxyServiceFactory::CreateProxyConfigService(
+          pref_proxy_config_tracker());
+
+  // Takes ownership of config_service.
+  io_thread()->SetSystemProxyConfigService(proxy_config_service);
+
+  // Initialize SystemUrlRequestContextGetter in |io_thread_|.
+  ignore_result(io_thread()->system_url_request_context_getter());
+}
+
 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)