Move creation and ownership of ResourceDispatcherHost and PluginService to content. This gives a ...

chrome/browser/browser_process_impl.h

Index: chrome/browser/browser_process_impl.h
===================================================================
--- chrome/browser/browser_process_impl.h	(revision 117096)
+++ chrome/browser/browser_process_impl.h	(working copy)
@@ -45,10 +45,8 @@
   explicit BrowserProcessImpl(const CommandLine& command_line);
   virtual ~BrowserProcessImpl();
 
-  // Some of our startup is interleaved with thread creation, driven
-  // by these functions.
-  void PreStartThread(content::BrowserThread::ID identifier);
-  void PostStartThread(content::BrowserThread::ID identifier);
+  // Called before the browser threads are created.
+  void PreCreateThreads();
 
   // Called after the threads have been created but before the message loops
   // starts running. Allows the browser process to do any initialization that
@@ -60,12 +58,11 @@
   // framework, rather than in the destructor, so that we can
   // interleave cleanup with threads being stopped.
   void StartTearDown();
-  void PreStopThread(content::BrowserThread::ID identifier);
-  void PostStopThread(content::BrowserThread::ID identifier);
+  void PostDestroyThreads();
 
   // BrowserProcess methods
+  virtual void ResourceDispatcherHostCreated() OVERRIDE;
   virtual void EndSession() OVERRIDE;
-  virtual ResourceDispatcherHost* resource_dispatcher_host() OVERRIDE;
   virtual MetricsService* metrics_service() OVERRIDE;
   virtual IOThread* io_thread() OVERRIDE;
   virtual WatchDogThread* watchdog_thread() OVERRIDE;
@@ -127,12 +124,7 @@
   virtual AudioManager* audio_manager() OVERRIDE;
 
  private:
-  // Must be called right before the IO thread is started.
-  void CreateIOThreadState();
-
-  void CreateResourceDispatcherHost();
   void CreateMetricsService();
-
   void CreateWatchdogThread();
 #if defined(OS_CHROMEOS)
   void InitializeWebSocketProxyThread();
@@ -159,9 +151,6 @@
   void ApplyAllowCrossOriginAuthPromptPolicy();
   void ApplyDefaultBrowserPolicy();
 
-  bool created_resource_dispatcher_host_;
-  scoped_ptr<ResourceDispatcherHost> resource_dispatcher_host_;
-
   bool created_metrics_service_;
   scoped_ptr<MetricsService> metrics_service_;