Extended: Add "system" URLRequestContext

chrome/browser/browser_process_impl.h

Index: chrome/browser/browser_process_impl.h
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index 5353a12709a01691cfb96688387a815f8fbbd2fc..fb922d16adef5ab18c9c87f984de2d080fa85dc4 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -20,6 +20,7 @@
 #include "base/scoped_ptr.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_status_updater.h"
+#include "chrome/browser/net/pref_proxy_config_service.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/tab_contents/thumbnail_generator.h"
 #include "chrome/common/notification_observer.h"
@@ -33,8 +34,13 @@ class DevToolsProtocolHandler;
 class FilePath;
 class NotificationService;
 class PluginDataRemover;
+class PrefProxyConfigTracker;
 class TabCloseableStateWatcher;
 
+namespace net {
+class ProxyConfigService;
+}  // namespace net
+
 // Real implementation of BrowserProcess that creates and returns the services.
 class BrowserProcessImpl : public BrowserProcess,
                            public base::NonThreadSafe,
@@ -61,6 +67,12 @@ class BrowserProcessImpl : public BrowserProcess,
   virtual DevToolsManager* devtools_manager();
   virtual SidebarManager* sidebar_manager();
   virtual ui::Clipboard* clipboard();
+  virtual PrefProxyConfigTracker* pref_proxy_config_tracker();
+  virtual scoped_refptr<URLRequestContextGetter> system_request_context();
+#if defined(OS_CHROMEOS)
+  virtual chromeos::ProxyConfigServiceImpl*
+      chromeos_proxy_config_service_impl();
+#endif  // defined(OS_CHROMEOS)
   virtual NotificationUIManager* notification_ui_manager();
   virtual policy::ConfigurationPolicyProviderKeeper*
       configuration_policy_provider_keeper();
@@ -137,6 +149,8 @@ class BrowserProcessImpl : public BrowserProcess,
   void CreateTabCloseableStateWatcher();
   void CreatePrintPreviewTabController();
   void CreateSafeBrowsingDetectionService();
+  void CreatePrefProxyConfigTracker();
+  void CreateSystemRequestContextGetter();
 
   bool IsSafeBrowsingDetectionServiceEnabled();
 
@@ -214,6 +228,11 @@ class BrowserProcessImpl : public BrowserProcess,
   scoped_ptr<safe_browsing::ClientSideDetectionService>
      safe_browsing_detection_service_;
 
+  bool created_pref_proxy_config_tracker_;
+  scoped_refptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
+
+  bool created_system_request_context_;
+
   unsigned int module_ref_count_;
   bool did_start_;
 
@@ -263,6 +282,11 @@ class BrowserProcessImpl : public BrowserProcess,
   void RestartPersistentInstance();
 #endif  // defined(OS_WIN) || defined(OS_LINUX)
 
+#if defined(OS_CHROMEOS)
+  scoped_refptr<chromeos::ProxyConfigServiceImpl>
+      chromeos_proxy_config_service_impl_;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
 };