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..afab4a2f3af840479ee1ced16e3b6d34a81424c9 100644
--- a/chrome/browser/chrome_browser_main.h
+++ b/chrome/browser/chrome_browser_main.h
@@ -102,12 +102,17 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
   const PrefService* local_state() const { return local_state_; }
 
  private:
-  // Methods for |SetupMetricsAndFieldTrials()| --------------------------------
+  // Methods for |SetupFieldTrials()| and |SetupMetrics()|----------------------

[Alexei Svitkine (slow), 2016/09/15 21:50:57]

I would just remove this line and the blank line below it.

[robliao, 2016/09/16 14:07:07]

Done.

 
   // Constructs metrics service and does related initialization, including

[Alexei Svitkine (slow), 2016/09/15 21:50:57]

Remove "Constructs metrics service"

[robliao, 2016/09/16 14:07:07]

Done.

-  // creation of field trials. Call only after labs have been converted to
-  // switches.
-  void SetupMetricsAndFieldTrials();
+  // creation of field trials. Call only after about:flags have been converted
+  // to switches.
+  // Sets up the field trials and related initialization. Call only after
+  // about:flags have been converted to switches.
+  void SetupFieldTrials();
+
+  // 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.
@@ -140,7 +145,7 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
   std::unique_ptr<ShutdownWatcherHelper> shutdown_watcher_;
 
   // Statistical testing infrastructure for the entire browser. NULL until

[Alexei Svitkine (slow), 2016/09/15 21:50:57]

Nit: NULL -> Null

[robliao, 2016/09/16 14:07:07]

Went with nullptr.

-  // SetupMetricsAndFieldTrials is called.
+  // |SetupFieldTrials()| is called.
   std::unique_ptr<base::FieldTrialList> field_trial_list_;
 
   ChromeBrowserFieldTrials browser_field_trials_;
@@ -190,7 +195,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