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

chrome/browser/metrics/antivirus_metrics_provider_win_unittest.cc

 // Copyright 2016 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/antivirus_metrics_provider_win.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/feature_list.h"
 #include "base/memory/ref_counted.h"
 #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"
 #include "base/win/windows_version.h"
 #include "components/variations/metrics_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 77 matching lines @@
   base::RunLoop run_loop_;
   base::ThreadChecker thread_checker_;
   base::WeakPtrFactory<AntiVirusMetricsProviderTest> weak_ptr_factory_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AntiVirusMetricsProviderTest);
 };
 
 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.
   bool previous_value = base::ThreadRestrictions::SetIOAllowed(false);
   provider_->GetAntiVirusMetrics(
       base::Bind(&AntiVirusMetricsProviderTest::GetMetricsCallback,
                  weak_ptr_factory_.GetWeakPtr()));
   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());