Extended: Add "system" URLRequestContext

chrome/browser/browser_process_impl.h

 // 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.
 
 // When each service is created, we set a flag indicating this. At this point,
 // the service initialization could fail or succeed. This allows us to remember
 // if we tried to create a service, and not try creating it over and over if
 // the creation failed.
 
 #ifndef CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
 #define CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/timer.h"
 #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"
 #include "chrome/common/notification_registrar.h"
 #include "ipc/ipc_message.h"
 
 class ChromeNetLog;
 class CommandLine;
 class DevToolsHttpProtocolHandler;
 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,
                            public NotificationObserver {
  public:
   explicit BrowserProcessImpl(const CommandLine& command_line);
   virtual ~BrowserProcessImpl();
 
   virtual void EndSession();
 
   // BrowserProcess methods
   virtual ResourceDispatcherHost* resource_dispatcher_host();
   virtual MetricsService* metrics_service();
   virtual IOThread* io_thread();
   virtual base::Thread* file_thread();
   virtual base::Thread* db_thread();
   virtual base::Thread* process_launcher_thread();
   virtual base::Thread* cache_thread();
 #if defined(USE_X11)
   virtual base::Thread* background_x11_thread();
 #endif
   virtual ProfileManager* profile_manager();
   virtual PrefService* local_state();
   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();
   virtual NotificationUIManager* notification_ui_manager();
   virtual policy::ConfigurationPolicyProviderKeeper*
       configuration_policy_provider_keeper();
   virtual IconManager* icon_manager();
   virtual ThumbnailGenerator* GetThumbnailGenerator();
   virtual AutomationProviderList* InitAutomationProviderList();
   virtual void InitDevToolsHttpProtocolHandler(
       const std::string& ip,
       int port,
       const std::string& frontend_url);
@@ skipping 24 matching lines @@
 #endif
 
   virtual bool have_inspector_files() const;
 
   virtual ChromeNetLog* net_log();
 
 #if defined(IPC_MESSAGE_LOG_ENABLED)
   virtual void SetIPCLoggingEnabled(bool enable);
 #endif
 
+  virtual void InitSystemRequestContext();

[willchan no longer on Chromium, 2011/02/15 01:05:58]

Isn't this a BrowserProcess method? Should it be with the other BrowserProcess
overrides?

[battre, 2011/02/15 19:32:49]

This is gone.

+
  private:
   void ClearLocalState(const FilePath& profile_path);
   bool ShouldClearLocalState(FilePath* profile_path);
 
   void CreateResourceDispatcherHost();
   void CreatePrefService();
   void CreateMetricsService();
 
   void CreateIOThread();
   static void CleanupOnIOThread();
@@ skipping 12 matching lines @@
   void CreateIconManager();
   void CreateDevToolsManager();
   void CreateSidebarManager();
   void CreateGoogleURLTracker();
   void CreateIntranetRedirectDetector();
   void CreateNotificationUIManager();
   void CreateStatusTrayManager();
   void CreateTabCloseableStateWatcher();
   void CreatePrintPreviewTabController();
   void CreateSafeBrowsingDetectionService();
+  void CreatePrefProxyConfigTracker();
+  void CreateSystemRequestContextGetter();
 
   bool IsSafeBrowsingDetectionServiceEnabled();
 
 #if defined(IPC_MESSAGE_LOG_ENABLED)
   void SetIPCLoggingEnabledForChildProcesses(bool enabled);
 #endif
 
   bool created_resource_dispatcher_host_;
   scoped_ptr<ResourceDispatcherHost> resource_dispatcher_host_;
 
@@ skipping 57 matching lines @@
   scoped_ptr<IntranetRedirectDetector> intranet_redirect_detector_;
 
   scoped_ptr<NotificationService> main_notification_service_;
 
   scoped_ptr<TabCloseableStateWatcher> tab_closeable_state_watcher_;
 
   bool created_safe_browsing_detection_service_;
   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_;
+  scoped_refptr<URLRequestContextGetter> system_request_context_;
+
   unsigned int module_ref_count_;
   bool did_start_;
 
   // Ensures that all the print jobs are finished before closing the browser.
   scoped_ptr<printing::PrintJobManager> print_job_manager_;
 
   std::string locale_;
 
   bool checked_for_new_frames_;
   bool using_new_frames_;
@@ skipping 33 matching lines @@
   // restarted, and if that's the case, restarts the browser.
   void OnAutoupdateTimer();
   bool CanAutorestartForUpdate() const;
   void RestartPersistentInstance();
 #endif  // defined(OS_WIN) || defined(OS_LINUX)
 
   DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
 };
 
 #endif  // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_