Refactor some more BrowserMain code. Move core code that's required by all embedders to content.

chrome/browser/browser_main.h

Index: chrome/browser/browser_main.h
===================================================================
--- chrome/browser/browser_main.h	(revision 100153)
+++ chrome/browser/browser_main.h	(working copy)
@@ -11,12 +11,17 @@
 #include "base/metrics/field_trial.h"
 #include "base/tracked_objects.h"
 #include "content/browser/browser_main.h"
+#include "chrome/browser/first_run/first_run.h"

[tony, 2011/09/08 17:21:04]

Nit: alphabetize

[jam, 2011/09/08 17:43:01]

Done.

 
+class BrowserProcessImpl;
 class FieldTrialSynchronizer;
 class HistogramSynchronizer;
 class MetricsService;
 class PrefService;
+class ProcessSingleton;
+class Profile;
 class ShutdownWatcherHelper;
+class TranslateManager;
 
 namespace chrome_browser {
 // For use by ShowMissingLocaleMessageBox.
@@ -28,10 +33,6 @@
  public:
   virtual ~ChromeBrowserMainParts();
 
-  // Constructs HistogramSynchronizer which gets released early (before
-  // main_message_loop_).
-  void SetupHistogramSynchronizer();
-
   // Constructs metrics service and does related initialization, including
   // creation of field trials. Call only after labs have been converted to
   // switches.
@@ -43,10 +44,11 @@
   explicit ChromeBrowserMainParts(const MainFunctionParams& parameters);
 
   virtual void PostMainMessageLoopStart() OVERRIDE;
+  virtual void PreMainMessageLoopRun() OVERRIDE;
+  virtual void MainMessageLoopRun() OVERRIDE;
+  virtual void PostMainMessageLoopRun() OVERRIDE;
   virtual void ToolkitInitialized() OVERRIDE;
 
-  virtual int TemporaryContinue() OVERRIDE;
-
  private:
   // Methods for |EarlyInitialization()| ---------------------------------------
 
@@ -102,8 +104,15 @@
 
   // Members initialized after / released before main_message_loop_ ------------
 
-  // Initialized in SetupHistogramSynchronizer.
+  scoped_ptr<BrowserProcessImpl> browser_process_;
   scoped_refptr<HistogramSynchronizer> histogram_synchronizer_;
+  scoped_ptr<ProcessSingleton> process_singleton_;
+  scoped_ptr<FirstRun::MasterPrefs> master_prefs_;
+  bool record_search_engine_;
+  TranslateManager* translate_manager_;
+  MetricsService* metrics_;
+  Profile* profile_;
+  bool run_message_loop_;
 
   // Initialized in SetupMetricsAndFieldTrials.
   scoped_refptr<FieldTrialSynchronizer> field_trial_synchronizer_;