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 {
 
+// The delay, in seconds, after starting recording before doing expensive
+// initialization work.
+#if defined(OS_ANDROID) || defined(OS_IOS)
+// On mobile devices, a significant portion of sessions last less than a minute.
+// Use a shorter timer on these platforms to avoid losing data.
+// TODO(dfalcantara): To avoid delaying startup, tighten up initialization so
+//                    that it occurs after the user gets their initial page.
+const int kInitializationDelaySeconds = 5;
+#else
+const int kInitializationDelaySeconds = 30;
+#endif
+
 // This specifies the amount of time to wait for all renderers to send their
 // data.
 const int kMaxHistogramGatheringWaitDuration = 60000;  // 60 seconds.
 
 metrics::SystemProfileProto::Channel AsProtobufChannel(
     chrome::VersionInfo::Channel channel) {
   switch (channel) {
     case chrome::VersionInfo::CHANNEL_UNKNOWN:
       return metrics::SystemProfileProto::CHANNEL_UNKNOWN;
     case chrome::VersionInfo::CHANNEL_CANARY:
@@ skipping 25 matching lines @@
 
   base::Closure callback_;
 
   DISALLOW_COPY_AND_ASSIGN(MetricsMemoryDetails);
 };
 
 }  // namespace
 
 ChromeMetricsServiceClient::ChromeMetricsServiceClient(
     metrics::MetricsStateManager* state_manager)
-    : waiting_for_collect_final_metrics_step_(false),
+    : 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) {
   // 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()));
+  client->metrics_service_.reset(new MetricsService(
+      state_manager, client.get(), g_browser_process->local_state()));
+
+  // Register metrics providers.
+  client->metrics_service_->RegisterMetricsProvider(
+      scoped_ptr<metrics::MetricsProvider>(
+          new ExtensionsMetricsProvider(state_manager)));
+
+#if defined(OS_CHROMEOS)
+  ChromeOSMetricsProvider* chromeos_metrics_provider =
+      new ChromeOSMetricsProvider;
+  client->chromeos_metrics_provider_ = chromeos_metrics_provider;
+  client->metrics_service_->RegisterMetricsProvider(
+      scoped_ptr<metrics::MetricsProvider>(chromeos_metrics_provider));
+#endif
+
   return client.Pass();
 }
 
 void ChromeMetricsServiceClient::SetClientID(const std::string& client_id) {
   crash_keys::SetClientID(client_id);
 }
 
 bool ChromeMetricsServiceClient::IsOffTheRecordSessionActive() {
   return !chrome::IsOffTheRecordSessionActive();
 }
@@ skipping 179 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.
-  done_callback.Run();
+  // TODO(blundell): Move all metrics gathering tasks from MetricsService to
+  // here.
+  // Schedules a task on the file thread for execution of slower
+  // initialization steps (such as plugin list generation) necessary
+  // for sending the initial log.  This avoids blocking the main UI
+  // thread.
+  content::BrowserThread::PostDelayedTask(
+      content::BrowserThread::FILE,

[Alexei Svitkine (slow), 2014/05/27 15:31:07]

I think this should be an implementation detail of ChromeOSMetricsProvider.

i.e. StartGatheringMetrics() should simply call:

  chromeos_metrics_provider_->InitTaskGetHardwareClass(target_loop,
                                                                                
          done_callback);

The small challenge there is the kInitializationDelaySeconds. One thing that we
can do is keep that in metrics_service.cc and only call StartGatheringMetrics
after kInitializationDelaySeconds has elapsed.

[blundell, 2014/05/28 15:42:38]

Done.

+      FROM_HERE,
+      base::Bind(&ChromeMetricsServiceClient::InitTaskGetHardwareClass,
+                 weak_ptr_factory_.GetWeakPtr(),
+                 base::MessageLoop::current()->message_loop_proxy(),
+                 done_callback),
+      base::TimeDelta::FromSeconds(kInitializationDelaySeconds));
+}
+
+void ChromeMetricsServiceClient::InitTaskGetHardwareClass(
+    base::MessageLoopProxy* target_loop,
+    const base::Closure& done_callback) {
+#if defined(OS_CHROMEOS)
+  chromeos_metrics_provider_->InitTaskGetHardwareClass(target_loop,
+                                                       done_callback);
+#else
+  target_loop->PostTask(FROM_HERE, done_callback);
+#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)