Set up the field trials before IOThread creation. We can't wait until after all the threads are c...

chrome/browser/chrome_browser_main.h

Index: chrome/browser/chrome_browser_main.h
===================================================================
--- chrome/browser/chrome_browser_main.h	(revision 117220)
+++ chrome/browser/chrome_browser_main.h	(working copy)
@@ -88,7 +88,6 @@
   }
 
   Profile* profile() { return profile_; }
-  MetricsService* metrics() { return metrics_; }
 
  private:
   // Methods for |EarlyInitialization()| ---------------------------------------
@@ -129,16 +128,16 @@
   // Constructs metrics service and does related initialization, including
   // creation of field trials. Call only after labs have been converted to
   // switches.
-  MetricsService* SetupMetricsAndFieldTrials(PrefService* local_state);
+  void SetupMetricsAndFieldTrials();
 
-  static MetricsService* InitializeMetrics(
-      const CommandLine& parsed_command_line,
-      const 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);
 
+  // Starts recording of metrics. This can only be called after we have a file
+  // thread.
+  void StartMetricsRecording();
+
   // Methods for Main Message Loop -------------------------------------------
 
   int PreCreateThreadsImpl();
@@ -193,7 +192,6 @@
   // PreMainMessageLoopRunThreadsCreated.
   bool is_first_run_;
   bool first_run_ui_bypass_;
-  MetricsService* metrics_;
   PrefService* local_state_;
   FilePath user_data_dir_;