Revert 111695 - Have content/ create and destroy its own threads.

chrome/browser/chrome_browser_main.h

Index: chrome/browser/chrome_browser_main.h
===================================================================
--- chrome/browser/chrome_browser_main.h	(revision 111697)
+++ chrome/browser/chrome_browser_main.h	(working copy)
@@ -14,9 +14,7 @@
 #include "base/tracked_objects.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/process_singleton.h"
-#include "chrome/browser/ui/browser_init.h"
 #include "content/public/browser/browser_main_parts.h"
-#include "content/public/browser/browser_thread.h"
 
 class BrowserInit;
 class BrowserProcessImpl;
@@ -60,15 +58,9 @@
   virtual void ToolkitInitialized() OVERRIDE;
   virtual void PreMainMessageLoopStart() OVERRIDE;
   virtual void PostMainMessageLoopStart() OVERRIDE;
-  virtual void PreCreateThreads() OVERRIDE;
-  virtual void PreStartThread(content::BrowserThread::ID identifier) OVERRIDE;
-  virtual void PostStartThread(content::BrowserThread::ID identifier) OVERRIDE;
   virtual void PreMainMessageLoopRun() OVERRIDE;
   virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
   virtual void PostMainMessageLoopRun() OVERRIDE;
-  virtual void PreStopThread(content::BrowserThread::ID identifier) OVERRIDE;
-  virtual void PostStopThread(content::BrowserThread::ID identifier) OVERRIDE;
-  virtual void PostDestroyThreads() OVERRIDE;
 
   // Displays a warning message that we can't find any locale data files.
   virtual void ShowMissingLocaleMessageBox() = 0;
@@ -129,7 +121,6 @@
 
   // Methods for Main Message Loop -------------------------------------------
 
-  int PreCreateThreadsImpl();
   int PreMainMessageLoopRunImpl();
 
   // Members initialized on construction ---------------------------------------
@@ -174,17 +165,6 @@
   // Initialized in SetupMetricsAndFieldTrials.
   scoped_refptr<FieldTrialSynchronizer> field_trial_synchronizer_;
 
-  // Members initialized in PreMainMessageLoopRun, needed in
-  // PreMainMessageLoopRunThreadsCreated.
-  bool is_first_run_;
-  bool first_run_ui_bypass_;
-  MetricsService* metrics_;
-  PrefService* local_state_;
-  FilePath user_data_dir_;
-
-  // Members needed across shutdown methods.
-  bool restart_last_session_;
-
   FRIEND_TEST_ALL_PREFIXES(BrowserMainTest,
                            WarmConnectionFieldTrial_WarmestSocket);
   FRIEND_TEST_ALL_PREFIXES(BrowserMainTest, WarmConnectionFieldTrial_Random);