Merge M56:Trim AV names.

chrome/browser/metrics/antivirus_metrics_provider_win.h

 // 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.
 
 #ifndef CHROME_BROWSER_METRICS_ANTIVIRUS_METRICS_PROVIDER_WIN_H_
 #define CHROME_BROWSER_METRICS_ANTIVIRUS_METRICS_PROVIDER_WIN_H_
 
 #include "components/metrics/metrics_provider.h"
 
 #include <iwscapi.h>
@@ skipping 67 matching lines @@
   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();
 
+  // Removes anything extraneous from the end of the product name such as
+  // versions, years, or anything containing numbers to make it more constant.
+  static std::string TrimVersionOfAvProductName(const std::string& av_product);
+
   // Called when metrics are done being gathered from the FILE thread.
   // |done_callback| is the callback that should be called once all metrics are
   // gathered.
   void GotAntiVirusProducts(const base::Closure& done_callback,
                             const std::vector<AvProduct>& av_products);
 
   // The TaskRunner on which file operations are performed (supplied by the
   // embedder).
   scoped_refptr<base::TaskRunner> task_runner_;
 
   // Information on installed AntiVirus gathered.
   std::vector<AvProduct> av_products_;
 
   base::ThreadChecker thread_checker_;
   base::WeakPtrFactory<AntiVirusMetricsProvider> weak_ptr_factory_;
 
   FRIEND_TEST_ALL_PREFIXES(AntiVirusMetricsProviderTest, GetMetricsFullName);
+  FRIEND_TEST_ALL_PREFIXES(AntiVirusMetricsProviderSimpleTest,
+                           StripProductVersion);
 
   DISALLOW_COPY_AND_ASSIGN(AntiVirusMetricsProvider);
 };
 
 #endif  // CHROME_BROWSER_METRICS_ANTIVIRUS_METRICS_PROVIDER_WIN_H_