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

chrome/browser/browser_main.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.
 
 #ifndef CHROME_BROWSER_BROWSER_MAIN_H_
 #define CHROME_BROWSER_BROWSER_MAIN_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #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.
 extern const char kMissingLocaleDataTitle[];
 extern const char kMissingLocaleDataMessage[];
 }
 
 class ChromeBrowserMainParts : public content::BrowserMainParts {
  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.
   MetricsService* SetupMetricsAndFieldTrials(
       const CommandLine& parsed_command_line,
       PrefService* local_state);
 
  protected:
   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()| ---------------------------------------
 
   // A/B test for the maximum number of persistent connections per host.
   void ConnectionFieldTrial();
 
   // A/B test for determining a value for unused socket timeout.
   void SocketTimeoutFieldTrial();
 
   // A/B test for the maximum number of connections per proxy server.
@@ skipping 35 matching lines @@
   // destroyed after the main_message_loop.
   tracked_objects::AutoTracking tracking_objects_;
 #endif
 
   // Statistical testing infrastructure for the entire browser. NULL until
   // SetupMetricsAndFieldTrials is called.
   scoped_ptr<base::FieldTrialList> field_trial_list_;
 
   // 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_;
 
   FRIEND_TEST(BrowserMainTest, WarmConnectionFieldTrial_WarmestSocket);
   FRIEND_TEST(BrowserMainTest, WarmConnectionFieldTrial_Random);
   FRIEND_TEST(BrowserMainTest, WarmConnectionFieldTrial_Invalid);
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts);
 };
 
@@ skipping 13 matching lines @@
 // Records the time from our process' startup to the present time in
 // the UMA histogram |metric_name|.
 void RecordBrowserStartupTime();
 
 // Records a time value to an UMA histogram in the context of the
 // PreReadExperiment field-trial. This also reports to the appropriate
 // sub-histogram (_PreRead(Enabled|Disabled)).
 void RecordPreReadExperimentTime(const char* name, base::TimeDelta time);
 
 #endif  // CHROME_BROWSER_BROWSER_MAIN_H_