Rearrange SetupMetricsAndFieldTrials to SetupFieldTrials and SetupMetrics

chrome/browser/chrome_browser_main.h

Index: chrome/browser/chrome_browser_main.h
diff --git a/chrome/browser/chrome_browser_main.h b/chrome/browser/chrome_browser_main.h
index 3064c709b1c614a6db2bb16831a6a03e3ca8007e..449cf9750528e764886ac93e006c4aaa0d747053 100644
--- a/chrome/browser/chrome_browser_main.h
+++ b/chrome/browser/chrome_browser_main.h
@@ -102,12 +102,12 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
   const PrefService* local_state() const { return local_state_; }
 
  private:
-  // Methods for |SetupMetricsAndFieldTrials()| --------------------------------
+  // Sets up the field trials and related initialization. Call only after
+  // about:flags have been converted to switches.
+  void SetupFieldTrials();
 
-  // Constructs metrics service and does related initialization, including
-  // creation of field trials. Call only after labs have been converted to
-  // switches.
-  void SetupMetricsAndFieldTrials();
+  // Constructs the metrics service and initializes metrics recording.
+  void SetupMetrics();
 
   // Starts recording of metrics. This can only be called after we have a file
   // thread.
@@ -139,8 +139,8 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
   // it is destroyed last.
   std::unique_ptr<ShutdownWatcherHelper> shutdown_watcher_;
 
-  // Statistical testing infrastructure for the entire browser. NULL until
-  // SetupMetricsAndFieldTrials is called.
+  // Statistical testing infrastructure for the entire browser. nullptr until
+  // |SetupFieldTrials()| is called.
   std::unique_ptr<base::FieldTrialList> field_trial_list_;
 
   ChromeBrowserFieldTrials browser_field_trials_;
@@ -190,7 +190,7 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
   bool run_message_loop_;
   std::unique_ptr<ThreeDAPIObserver> three_d_observer_;
 
-  // Initialized in SetupMetricsAndFieldTrials.
+  // Initialized in |SetupFieldTrials()|.
   scoped_refptr<FieldTrialSynchronizer> field_trial_synchronizer_;
 
   // Members initialized in PreMainMessageLoopRun, needed in