Correctly call trim function from antivirus metrics.

chrome/browser/metrics/antivirus_metrics_provider_win.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 <iwscapi.h>
 #include <stddef.h>
 #include <wbemidl.h>
 #include <windows.h>
@@ skipping 278 matching lines @@
       return RESULT_PRODUCT_STATE_INVALID;
 
     av_product.set_product_state(
         static_cast<metrics::SystemProfileProto::AntiVirusState>(
             product_state));
 
     base::win::ScopedBstr product_name;
     result = product->get_ProductName(product_name.Receive());
     if (FAILED(result))
       return RESULT_FAILED_TO_GET_PRODUCT_NAME;
-    std::string name =
-        base::SysWideToUTF8(std::wstring(product_name, product_name.Length()));
+    std::string name = TrimVersionOfAvProductName(
+        base::SysWideToUTF8(std::wstring(product_name, product_name.Length())));
     product_name.Release();
     if (ShouldReportFullNames())
       av_product.set_product_name(name);
     av_product.set_product_name_hash(metrics::HashName(name));
 
     base::win::ScopedBstr remediation_path;
     result = product->get_RemediationPath(remediation_path.Receive());
     if (FAILED(result))
       return RESULT_FAILED_TO_GET_REMEDIATION_PATH;
     std::wstring path_str(remediation_path, remediation_path.Length());
@@ skipping 109 matching lines @@
     }
 
     base::win::ScopedVariant display_name;
     hr = class_object->Get(L"displayName", 0, display_name.Receive(), 0, 0);
 
     if (FAILED(hr) || display_name.type() != VT_BSTR)
       return RESULT_FAILED_TO_GET_PRODUCT_NAME;
 
     // Owned by ScopedVariant.
     BSTR temp_bstr = V_BSTR(display_name.ptr());
-    std::string name(base::SysWideToUTF8(
+    std::string name = TrimVersionOfAvProductName(base::SysWideToUTF8(
         std::wstring(temp_bstr, ::SysStringLen(temp_bstr))));
 
     if (ShouldReportFullNames())
       av_product.set_product_name(name);
     av_product.set_product_name_hash(metrics::HashName(name));
 
     base::win::ScopedVariant exe_path;
     hr = class_object->Get(L"pathToSignedProductExe", 0, exe_path.Receive(), 0,
                            0);
 
@@ skipping 57 matching lines @@
   std::string product_name("Trusteer Endpoint Protection");
   if (ShouldReportFullNames()) {
     av_product.set_product_name(product_name);
     av_product.set_product_version(product_version);
   }
   av_product.set_product_name_hash(metrics::HashName(product_name));
   av_product.set_product_version_hash(metrics::HashName(product_version));
 
   products->push_back(av_product);
 }