Merge M56: Add support to detect unregistered AV products in system profile.

chrome/browser/metrics/antivirus_metrics_provider_win.h

Index: chrome/browser/metrics/antivirus_metrics_provider_win.h
diff --git a/chrome/browser/metrics/antivirus_metrics_provider_win.h b/chrome/browser/metrics/antivirus_metrics_provider_win.h
index 13a6b4968eb7c06ffa6c2f36dec19a20a0955be7..0bf86852e9c5bf28e4a0f36f110eecd39837b1ef 100644
--- a/chrome/browser/metrics/antivirus_metrics_provider_win.h
+++ b/chrome/browser/metrics/antivirus_metrics_provider_win.h
@@ -72,10 +72,17 @@ class AntiVirusMetricsProvider : public metrics::MetricsProvider {
   // interface is only available on Windows 8 and above.
   static ResultCode FillAntiVirusProductsFromWSC(
       std::vector<AvProduct>* products);
+
   // Query WMI ROOT\SecurityCenter2 for installed AV products. This interface is
   // only available on Windows Vista and above.
   static ResultCode FillAntiVirusProductsFromWMI(
       std::vector<AvProduct>* products);
+
+  // Query local machine configuration for other products that might not be
+  // registered in WMI or Security Center and add them to the product vector.
+  static void MaybeAddUnregisteredAntiVirusProducts(
+      std::vector<AvProduct>* products);
+
   static std::vector<AvProduct> GetAntiVirusProductsOnFileThread();
 
   // Called when metrics are done being gathered from the FILE thread.