Move ChromeOS hardware class init out of MetricsService.

chrome/browser/metrics/chrome_metrics_service_client.h

 // Copyright 2014 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_METRICS_CHROME_METRICS_SERVICE_CLIENT_H_
 #define CHROME_BROWSER_METRICS_CHROME_METRICS_SERVICE_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "chrome/browser/metrics/network_stats_uploader.h"
 #include "components/metrics/metrics_service_client.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
+class ChromeOSMetricsProvider;
 class MetricsService;
 
 namespace metrics {
 class MetricsStateManager;
 }
 
 // ChromeMetricsServiceClient provides an implementation of MetricsServiceClient
 // that depends on chrome/.
 class ChromeMetricsServiceClient : public metrics::MetricsServiceClient,
                                    public content::NotificationObserver {
@@ skipping 17 matching lines @@
       const base::Closure& done_callback) OVERRIDE;
   virtual void CollectFinalMetrics(const base::Closure& done_callback)
       OVERRIDE;
 
   MetricsService* metrics_service() { return metrics_service_.get(); }
 
  private:
   explicit ChromeMetricsServiceClient(
       metrics::MetricsStateManager* state_manager);
 
+  // Completes the two-phase initialization of ChromeMetricsServiceClient.
+  void Initialize();
+
   // Callbacks for various stages of final log info collection. Do not call
   // these directly.
   void OnMemoryDetailCollectionDone();
   void OnHistogramSynchronizationDone();
 
   // Records metrics about the switches present on the command line.
   void RecordCommandLineMetrics();
 
   // Registers |this| as an observer for notifications which indicate that a
   // user is performing work. This is useful to allow some features to sleep,
   // until the machine becomes active, such as precluding UMA uploads unless
   // there was recent activity.
   void RegisterForNotifications();
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
 #if defined(OS_WIN)
   // Counts (and removes) the browser crash dump attempt signals left behind by
   // any previous browser processes which generated a crash dump.
   void CountBrowserCrashDumpAttempts();
 #endif  // OS_WIN
 
   base::ThreadChecker thread_checker_;
 
+  // Weak pointer to the MetricsStateManager.
+  metrics::MetricsStateManager* metrics_state_manager_;
+
   // The MetricsService that |this| is a client of.
   scoped_ptr<MetricsService> metrics_service_;
 
   content::NotificationRegistrar registrar_;
 
+  // On ChromeOS, holds a weak pointer to the ChromeOSMetricsProvider instance
+  // that has been registered with MetricsService. On other platforms, is NULL.
+  ChromeOSMetricsProvider* chromeos_metrics_provider_;
+
   NetworkStatsUploader network_stats_uploader_;
 
   // Saved callback received from CollectFinalMetrics().
   base::Closure collect_final_metrics_done_callback_;
 
   // Indicates that collect final metrics step is running.
   bool waiting_for_collect_final_metrics_step_;
 
   // Number of async histogram fetch requests in progress.
   int num_async_histogram_fetches_in_progress_;
 
   base::WeakPtrFactory<ChromeMetricsServiceClient> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeMetricsServiceClient);
 };
 
 #endif  // CHROME_BROWSER_METRICS_CHROME_METRICS_SERVICE_CLIENT_H_