Revert "Add support for obtaining AV products on Win7."

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 96f5444c22964b736d976f9ad83f3ea0f89d40d6..7c4ef849de126193d3f8d2068e3f4fcde404eeb1 100644
--- a/chrome/browser/metrics/antivirus_metrics_provider_win.h
+++ b/chrome/browser/metrics/antivirus_metrics_provider_win.h
@@ -58,23 +58,12 @@ class AntiVirusMetricsProvider : public metrics::MetricsProvider {
     RESULT_PRODUCT_STATE_INVALID = 8,
     RESULT_FAILED_TO_GET_PRODUCT_NAME = 9,
     RESULT_FAILED_TO_GET_REMEDIATION_PATH = 10,
-    RESULT_FAILED_TO_CONNECT_TO_WMI = 11,
-    RESULT_FAILED_TO_SET_SECURITY_BLANKET = 12,
-    RESULT_FAILED_TO_EXEC_WMI_QUERY = 13,
-    RESULT_FAILED_TO_ITERATE_RESULTS = 14,
-    RESULT_COUNT = 15
+    RESULT_COUNT = 11
   };
 
   typedef metrics::SystemProfileProto::AntiVirusProduct AvProduct;
 
-  // Query COM interface IWSCProductList for installed AV products. This
-  // 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);
+  static ResultCode FillAntiVirusProducts(std::vector<AvProduct>* products);
   static std::vector<AvProduct> GetAntiVirusProductsOnFileThread();
 
   // Called when metrics are done being gathered from the FILE thread.
@@ -93,8 +82,6 @@ class AntiVirusMetricsProvider : public metrics::MetricsProvider {
   base::ThreadChecker thread_checker_;
   base::WeakPtrFactory<AntiVirusMetricsProvider> weak_ptr_factory_;
 
-  FRIEND_TEST_ALL_PREFIXES(AntiVirusMetricsProviderTest, GetMetricsFullName);
-
   DISALLOW_COPY_AND_ASSIGN(AntiVirusMetricsProvider);
 };