Rearrange SetupMetricsAndFieldTrials to SetupFieldTrials and SetupMetrics

chrome/browser/chrome_browser_main.h

 // Copyright (c) 2012 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_CHROME_BROWSER_MAIN_H_
 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 84 matching lines @@
   }
   const base::FilePath& user_data_dir() const {
     return user_data_dir_;
   }
 
   Profile* profile() { return profile_; }
 
   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.
   void StartMetricsRecording();
 
   // Record time from process startup to present time in an UMA histogram.
   void RecordBrowserStartupTime();
 
   // Reads origin trial policy data from local state and configures command line
   // for child processes.
@@ skipping 11 matching lines @@
   int result_code_;
 
   // Create StartupTimeBomb object for watching jank during startup.
   std::unique_ptr<StartupTimeBomb> startup_watcher_;
 
   // Create ShutdownWatcherHelper object for watching jank during shutdown.
   // Please keep |shutdown_watcher| as the first object constructed, and hence
   // it is destroyed last.
   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_;
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
   // A monitor for attributing power consumption to origins.
   std::unique_ptr<ProcessPowerCollector> process_power_collector_;
 
   std::unique_ptr<WebUsbDetector> web_usb_detector_;
 #endif
@@ skipping 29 matching lines @@
       ProcessSingleton::PROCESS_NONE;
 
   // Members needed across shutdown methods.
   bool restart_last_session_ = false;
 #endif
 
   Profile* profile_;
   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
   // PreMainMessageLoopRunThreadsCreated.
   PrefService* local_state_;
   base::FilePath user_data_dir_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts);
 };
 
 #endif  // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_