Move ChromeOS hardware class init out of MetricsService.

chrome/browser/metrics/metrics_service.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.
 
 // This file defines a service that collects information about the user
 // experience in order to help improve future versions of the app.
 
 #ifndef CHROME_BROWSER_METRICS_METRICS_SERVICE_H_
 #define CHROME_BROWSER_METRICS_METRICS_SERVICE_H_
 
@@ skipping 240 matching lines @@
     SENDING_CURRENT_LOGS,           // Sending ongoing logs as they accrue.
   };
 
   enum ShutdownCleanliness {
     CLEANLY_SHUTDOWN = 0xdeadbeef,
     NEED_TO_SHUTDOWN = ~CLEANLY_SHUTDOWN
   };
 
   typedef std::vector<SyntheticTrialGroup> SyntheticTrialGroups;
 
-  // First part of the init task. Called on the FILE thread to load hardware
-  // class information.
-  static void InitTaskGetHardwareClass(base::WeakPtr<MetricsService> self,
-                                       base::MessageLoopProxy* target_loop);
+  // Calls into the client to start metrics gathering.
+  void StartGatheringMetrics();
 
-  // Callback from InitTaskGetHardwareClass() that continues the init task by
-  // loading plugin information.
-  void OnInitTaskGotHardwareClass(const std::string& hardware_class);
+  // Callback that continues the init task by loading plugin information.
+  void OnInitTaskGotHardwareClass();
 
   // Called after the Plugin init task has been completed that continues the
   // init task by launching a task to gather Google Update statistics.
   void OnInitTaskGotPluginInfo();
 
   // Called after GoogleUpdate init task has been completed that continues the
   // init task by loading profiler data.
   void OnInitTaskGotGoogleUpdateData();
 
   void OnUserAction(const std::string& action);
@@ skipping 157 matching lines @@
   // be cut, and logs are neither persisted nor uploaded.
   bool test_mode_active_;
 
   // The progression of states made by the browser are recorded in the following
   // state.
   State state_;
 
   // Whether the initial stability log has been recorded during startup.
   bool has_initial_stability_log_;
 
-  // Chrome OS hardware class (e.g., hardware qualification ID). This
-  // class identifies the configured system components such as CPU,
-  // WiFi adapter, etc.  For non Chrome OS hosts, this will be an
-  // empty string.
-  std::string hardware_class_;
-
 #if defined(ENABLE_PLUGINS)
   PluginMetricsProvider* plugin_metrics_provider_;
 #endif
 
 #if defined(OS_WIN)
   GoogleUpdateMetricsProviderWin* google_update_metrics_provider_;
 #endif
 
   // The initial metrics log, used to record startup metrics (histograms and
   // profiler data). Note that if a crash occurred in the previous session, an
@@ skipping 58 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, IsPluginProcess);
   FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, MetricsServiceObserver);
   FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest,
                            PermutedEntropyCacheClearedWhenLowEntropyReset);
   FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, RegisterSyntheticTrial);
 
   DISALLOW_COPY_AND_ASSIGN(MetricsService);
 };
 
 #endif  // CHROME_BROWSER_METRICS_METRICS_SERVICE_H_