Revert 84197 - Add one-time randomization support for FieldTrial, and the ability to

chrome/browser/browser_main.h

Index: chrome/browser/browser_main.h
===================================================================
--- chrome/browser/browser_main.h	(revision 84367)
+++ chrome/browser/browser_main.h	(working copy)
@@ -13,12 +13,10 @@
 
 class BrowserThread;
 class CommandLine;
-class FieldTrialSynchronizer;
 class HighResolutionTimerManager;
 struct MainFunctionParams;
 class MessageLoop;
 class MetricsService;
-class PrefService;
 
 namespace net {
 class NetworkChangeNotifier;
@@ -82,12 +80,7 @@
   void EarlyInitialization();
   void MainMessageLoopStart();
 
-  // 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);
+  void SetupFieldTrials();
 
  protected:
   explicit BrowserMainParts(const MainFunctionParams& parameters);
@@ -139,15 +132,6 @@
 
   void InitializeMainThread();
 
-  // Methods for |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();
-
   // Members initialized on construction ---------------------------------------
 
   const MainFunctionParams& parameters_;
@@ -160,9 +144,8 @@
   tracked_objects::AutoTracking tracking_objects_;
 #endif
 
-  // Statistical testing infrastructure for the entire browser. NULL until
-  // SetupMetricsAndFieldTrials is called.
-  scoped_ptr<base::FieldTrialList> field_trial_list_;
+  // Statistical testing infrastructure for the entire browser.
+  base::FieldTrialList field_trial_;
 
   // Members initialized in |MainMessageLoopStart()| ---------------------------
   scoped_ptr<MessageLoop> main_message_loop_;
@@ -171,9 +154,6 @@
   scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
   scoped_ptr<BrowserThread> main_thread_;
 
-  // Initialized in SetupMetricsAndFieldTrials.
-  scoped_refptr<FieldTrialSynchronizer> field_trial_synchronizer_;
-
   DISALLOW_COPY_AND_ASSIGN(BrowserMainParts);
 };