Add AntiVirus information to the system profile.

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 <stddef.h>
 
 #include <vector>
 
@@ skipping 69 matching lines @@
 #include "chrome/browser/metrics/plugin_metrics_provider.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/metrics/chromeos_metrics_provider.h"
 #include "chrome/browser/signin/signin_status_metrics_provider_chromeos.h"
 #endif
 
 #if defined(OS_WIN)
 #include <windows.h>
+#include "chrome/browser/metrics/antivirus_metrics_provider_win.h"
 #include "chrome/browser/metrics/google_update_metrics_provider_win.h"
 #include "chrome/common/metrics_constants_util_win.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "components/browser_watcher/watcher_metrics_provider_win.h"
 #endif
 
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/signin/chrome_signin_status_metrics_provider_delegate.h"
 #include "components/signin/core/browser/signin_status_metrics_provider.h"
 #endif  // !defined(OS_CHROMEOS)
@@ skipping 338 matching lines @@
   google_update_metrics_provider_ = new GoogleUpdateMetricsProviderWin;
   metrics_service_->RegisterMetricsProvider(
       std::unique_ptr<metrics::MetricsProvider>(
           google_update_metrics_provider_));
 
   metrics_service_->RegisterMetricsProvider(
       std::unique_ptr<metrics::MetricsProvider>(
           new browser_watcher::WatcherMetricsProviderWin(
               chrome::GetBrowserExitCodesRegistryPath(),
               content::BrowserThread::GetBlockingPool())));
+
+  antivirus_metrics_provider_ = new AntiVirusMetricsProvider(
+      content::BrowserThread::GetMessageLoopProxyForThread(
+          content::BrowserThread::FILE));

[Alexei Svitkine (slow), 2016/06/03 15:48:34]

Any reason to use FILE instead of the worker pool? I think worker pool is
generally preferred these days.

[Will Harris, 2016/06/03 20:51:30]

I was using the same thread that GetDriveMetrics runs on, but I've switched to
the blocking pool. Thanks.

+
+  metrics_service_->RegisterMetricsProvider(
+      std::unique_ptr<metrics::MetricsProvider>(antivirus_metrics_provider_));
 #endif  // defined(OS_WIN)
 
 #if defined(ENABLE_PLUGINS)
   plugin_metrics_provider_ =
       new PluginMetricsProvider(g_browser_process->local_state());
   metrics_service_->RegisterMetricsProvider(
       std::unique_ptr<metrics::MetricsProvider>(plugin_metrics_provider_));
 #endif  // defined(ENABLE_PLUGINS)
 
 #if defined(OS_CHROMEOS)
@@ skipping 58 matching lines @@
                  weak_ptr_factory_.GetWeakPtr());
 
 #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
   google_update_metrics_provider_->GetGoogleUpdateData(got_metrics_callback);
 #else
   got_metrics_callback.Run();
 #endif  // defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
 }
 
 void ChromeMetricsServiceClient::OnInitTaskGotGoogleUpdateData() {
+  const base::Closure got_metrics_callback =
+      base::Bind(&ChromeMetricsServiceClient::OnInitTaskGotAntiVirusData,
+                 weak_ptr_factory_.GetWeakPtr());
+
+#if defined(OS_WIN)
+  antivirus_metrics_provider_->GetAntiVirusMetrics(got_metrics_callback);
+#else
+  got_metrics_callback.Run();
+#endif  // defined(OS_WIN)
+}
+
+void ChromeMetricsServiceClient::OnInitTaskGotAntiVirusData() {
   drive_metrics_provider_->GetDriveMetrics(
       base::Bind(&ChromeMetricsServiceClient::OnInitTaskGotDriveMetrics,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void ChromeMetricsServiceClient::OnInitTaskGotDriveMetrics() {
   finished_init_task_callback_.Run();
 }
 
 bool ChromeMetricsServiceClient::ShouldIncludeProfilerDataInLog() {
@@ skipping 174 matching lines @@
   }
 }
 
 void ChromeMetricsServiceClient::OnURLOpenedFromOmnibox(OmniboxLog* log) {
   metrics_service_->OnApplicationNotIdle();
 }
 
 bool ChromeMetricsServiceClient::IsUMACellularUploadLogicEnabled() {
   return metrics::IsCellularLogicEnabled();
 }