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

chrome/browser/metrics/antivirus_metrics_provider_win_unittest.cc

Index: chrome/browser/metrics/antivirus_metrics_provider_win_unittest.cc
diff --git a/chrome/browser/metrics/antivirus_metrics_provider_win_unittest.cc b/chrome/browser/metrics/antivirus_metrics_provider_win_unittest.cc
index 6e07842bfcc80eca880402ae4d6537a6898ca26f..29c8da2835505239b4de8d57f817be5cca6abfc8 100644
--- a/chrome/browser/metrics/antivirus_metrics_provider_win_unittest.cc
+++ b/chrome/browser/metrics/antivirus_metrics_provider_win_unittest.cc
@@ -12,7 +12,6 @@
 #include "base/memory/weak_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/test/histogram_tester.h"
 #include "base/threading/thread_checker.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/version.h"
@@ -110,7 +109,6 @@ class AntiVirusMetricsProviderTest : public ::testing::TestWithParam<bool> {
 
 TEST_P(AntiVirusMetricsProviderTest, GetMetricsFullName) {
   ASSERT_TRUE(thread_checker_.CalledOnValidThread());
-  base::HistogramTester histograms;
   SetFullNamesFeatureEnabled(expect_unhashed_value_);
   // Make sure the I/O is happening on the FILE thread by disallowing it on
   // the main thread.
@@ -121,8 +119,6 @@ TEST_P(AntiVirusMetricsProviderTest, GetMetricsFullName) {
   content::RunThisRunLoop(&run_loop_);
   EXPECT_TRUE(got_results_);
   base::ThreadRestrictions::SetIOAllowed(previous_value);
-  histograms.ExpectUniqueSample("UMA.AntiVirusMetricsProvider.Result",
-                                AntiVirusMetricsProvider::RESULT_SUCCESS, 1);
 }
 
 INSTANTIATE_TEST_CASE_P(, AntiVirusMetricsProviderTest, ::testing::Bool());