Move ChromeOS hardware class init out of MetricsService.

chrome/browser/metrics/chrome_metrics_service_client.cc

 // 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.
 
 #include "chrome/browser/metrics/chrome_metrics_service_client.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/memory_details.h"
+#include "chrome/browser/metrics/extensions_metrics_provider.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/ui/browser_otr_state.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/crash_keys.h"
 #include "chrome/common/render_messages.h"
+#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/histogram_fetcher.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/service_process/service_process_control.h"
 #endif
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/metrics/chromeos_metrics_provider.h"
+#endif
+
 #if defined(OS_WIN)
 #include <windows.h>
 #include "base/win/registry.h"
 #include "chrome/browser/metrics/google_update_metrics_provider_win.h"
 #endif
 
 namespace {
 
 // This specifies the amount of time to wait for all renderers to send their
 // data.
@@ skipping 33 matching lines @@
 
   base::Closure callback_;
 
   DISALLOW_COPY_AND_ASSIGN(MetricsMemoryDetails);
 };
 
 }  // namespace
 
 ChromeMetricsServiceClient::ChromeMetricsServiceClient(
     metrics::MetricsStateManager* state_manager)
-    : waiting_for_collect_final_metrics_step_(false),
+    : metrics_state_manager_(state_manager),
+      chromeos_metrics_provider_(NULL),
+      waiting_for_collect_final_metrics_step_(false),
       num_async_histogram_fetches_in_progress_(0),
       weak_ptr_factory_(this) {
   DCHECK(thread_checker_.CalledOnValidThread());
   RecordCommandLineMetrics();
   RegisterForNotifications();
 
 #if defined(OS_WIN)
   CountBrowserCrashDumpAttempts();
 #endif  // defined(OS_WIN)
 }
 
 ChromeMetricsServiceClient::~ChromeMetricsServiceClient() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 // static
 scoped_ptr<ChromeMetricsServiceClient> ChromeMetricsServiceClient::Create(
     metrics::MetricsStateManager* state_manager,
     PrefService* local_state) {
   // Perform two-phase initialization so that |client->metrics_service_| only
   // receives pointers to fully constructed objects.
   scoped_ptr<ChromeMetricsServiceClient> client(
       new ChromeMetricsServiceClient(state_manager));
-  client->metrics_service_.reset(
-      new MetricsService(state_manager, client.get(), local_state));
+  client->Initialize();
+
   return client.Pass();
 }
 
+void ChromeMetricsServiceClient::Initialize() {
+  metrics_service_.reset(new MetricsService(
+      metrics_state_manager_, this, g_browser_process->local_state()));
+
+  // Register metrics providers.
+  metrics_service_->RegisterMetricsProvider(
+      scoped_ptr<metrics::MetricsProvider>(
+          new ExtensionsMetricsProvider(metrics_state_manager_)));
+
+#if defined(OS_CHROMEOS)
+  ChromeOSMetricsProvider* chromeos_metrics_provider =
+      new ChromeOSMetricsProvider;
+  chromeos_metrics_provider_ = chromeos_metrics_provider;
+  metrics_service_->RegisterMetricsProvider(
+      scoped_ptr<metrics::MetricsProvider>(chromeos_metrics_provider));
+#endif
+}
+
 void ChromeMetricsServiceClient::SetClientID(const std::string& client_id) {
   crash_keys::SetClientID(client_id);
 }
 
 bool ChromeMetricsServiceClient::IsOffTheRecordSessionActive() {
   return !chrome::IsOffTheRecordSessionActive();
 }
 
 std::string ChromeMetricsServiceClient::GetApplicationLocale() {
   return g_browser_process->GetApplicationLocale();
@@ skipping 176 matching lines @@
       metrics_service_->OnApplicationNotIdle();
       break;
 
     default:
       NOTREACHED();
   }
 }
 
 void ChromeMetricsServiceClient::StartGatheringMetrics(
     const base::Closure& done_callback) {
-  // TODO(blundell): Move metrics gathering tasks from MetricsService to here.
+// TODO(blundell): Move all metrics gathering tasks from MetricsService to
+// here.
+#if defined(OS_CHROMEOS)
+  chromeos_metrics_provider_->InitTaskGetHardwareClass(done_callback);
+#else
   done_callback.Run();
+#endif
 }
 
 #if defined(OS_WIN)
 void ChromeMetricsServiceClient::CountBrowserCrashDumpAttempts() {
   // Open the registry key for iteration.
   base::win::RegKey regkey;
   if (regkey.Open(HKEY_CURRENT_USER,
                   chrome::kBrowserCrashDumpAttemptsRegistryPath,
                   KEY_ALL_ACCESS) != ERROR_SUCCESS) {
     return;
@@ skipping 33 matching lines @@
   // Capture the histogram samples.
   if (dumps_with_crash != 0)
     UMA_HISTOGRAM_COUNTS("Chrome.BrowserDumpsWithCrash", dumps_with_crash);
   if (dumps_with_no_crash != 0)
     UMA_HISTOGRAM_COUNTS("Chrome.BrowserDumpsWithNoCrash", dumps_with_no_crash);
   int total_dumps = dumps_with_crash + dumps_with_no_crash;
   if (total_dumps != 0)
     UMA_HISTOGRAM_COUNTS("Chrome.BrowserCrashDumpAttempts", total_dumps);
 }
 #endif  // defined(OS_WIN)