Revert 103628 (I have a simpler fix) - Fix the metrics service not working because it was initialized before the browser threads were started.

BUG=98756
Review URL: http://codereview.chromium.org/8102017

TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/8101012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103636 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 8 deletions

diff --git a/chrome/browser/chrome_browser_main.h b/chrome/browser/chrome_browser_main.h
index ddfcd3a..d3e8fda 100644
--- a/chrome/browser/chrome_browser_main.h
+++ b/chrome/browser/chrome_browser_main.h
@@ -33,6 +33,13 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
  public:
   virtual ~ChromeBrowserMainParts();
 
+  // 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);
 
@@ -73,17 +80,12 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
   // has on retention and general apps/webstore usage.
   void DefaultAppsFieldTrial();
 
-  // Constructs metrics service and field trials. Call only after labs have been
-  // converted to switches.
-  MetricsService* CreateMetrics(
+  // Methods for |SetupMetricsAndFieldTrials()| --------------------------------
+
+  static MetricsService* InitializeMetrics(
       const CommandLine& parsed_command_line,
       const PrefService* local_state);
 
-  // Initializes metrics service and sets up the field trial experiments.
-  void SetupMetricsAndFieldTrials(MetricsService* metrics,
-                                  const CommandLine& parsed_command_line,
-                                  PrefService* local_state);
-
   // Add an invocation of your field trial init function to this method.
   void SetupFieldTrials(bool metrics_recording_enabled,
                         bool proxy_policy_is_set);