Merge M56:Trim AV names.

Merge M56:Trim AV names.

Correctly call trim function from antivirus metrics.

BUG=615154
Review-Url: https://codereview.chromium.org/2635333002
Cr-Commit-Position: refs/heads/master@{#444182}
(cherry picked from commit 1ce0d75da469537fd542b02ed0cf36bd9d95ecb7)

Trim version and extraneus parts from AntiVirus product names.

Some AV products include their version in the product name in WMI which makes
maintaining the list of hashes of product names onerous.

Therefore, trim anything that looks like a version, along with trailing spaces.

BUG=615154
TEST=unit_tests --gtest_filter=AntiVirusMetricsProvider*

Review-Url: https://codereview.chromium.org/2631583002
Cr-Commit-Position: refs/heads/master@{#443594}
(cherry picked from commit da07d58a5d041395d3d6317ab3aef31c0087285e)

Review-Url: https://codereview.chromium.org/2645473003 .
Cr-Commit-Position: refs/branch-heads/2924@{#794}
Cr-Branched-From: 3a87aecc31cd1ffe751dd72c04e5a96a1fc8108a-refs/heads/master@{#433059}
Committed: https://chromium.googlesource.com/chromium/src/+/1cb5cebfa54152b226f9ec83589d79af4815c7da

[Will Harris, 2017-01-18 19:37:09]

Description was changed from

==========
Merge M56:Trim AV names. (Two CLs)

Correctly call trim function from antivirus metrics.

BUG=615154

Review-Url: https://codereview.chromium.org/2635333002
Cr-Commit-Position: refs/heads/master@{#444182}
(cherry picked from commit 1ce0d75da469537fd542b02ed0cf36bd9d95ecb7)

Trim version and extraneus parts from AntiVirus product names.

Some AV products include their version in the product name in WMI which makes
maintaining the list of hashes of product names onerous.

Therefore, trim anything that looks like a version, along with trailing spaces.

BUG=615154
TEST=unit_tests --gtest_filter=AntiVirusMetricsProvider*

Review-Url: https://codereview.chromium.org/2631583002
Cr-Commit-Position: refs/heads/master@{#443594}
(cherry picked from commit da07d58a5d041395d3d6317ab3aef31c0087285e)
==========

to

==========
Merge M56:Trim AV names.

Correctly call trim function from antivirus metrics.

BUG=615154

Review-Url: https://codereview.chromium.org/2635333002
Cr-Commit-Position: refs/heads/master@{#444182}
(cherry picked from commit 1ce0d75da469537fd542b02ed0cf36bd9d95ecb7)

Trim version and extraneus parts from AntiVirus product names.

Some AV products include their version in the product name in WMI which makes
maintaining the list of hashes of product names onerous.

Therefore, trim anything that looks like a version, along with trailing spaces.

BUG=615154
TEST=unit_tests --gtest_filter=AntiVirusMetricsProvider*

Review-Url: https://codereview.chromium.org/2631583002
Cr-Commit-Position: refs/heads/master@{#443594}
(cherry picked from commit da07d58a5d041395d3d6317ab3aef31c0087285e)
==========

[Will Harris, 2017-01-18 19:59:02]

Description was changed from

==========
Merge M56:Trim AV names.

Correctly call trim function from antivirus metrics.

BUG=615154

Review-Url: https://codereview.chromium.org/2635333002
Cr-Commit-Position: refs/heads/master@{#444182}
(cherry picked from commit 1ce0d75da469537fd542b02ed0cf36bd9d95ecb7)

Trim version and extraneus parts from AntiVirus product names.

Some AV products include their version in the product name in WMI which makes
maintaining the list of hashes of product names onerous.

Therefore, trim anything that looks like a version, along with trailing spaces.

BUG=615154
TEST=unit_tests --gtest_filter=AntiVirusMetricsProvider*

Review-Url: https://codereview.chromium.org/2631583002
Cr-Commit-Position: refs/heads/master@{#443594}
(cherry picked from commit da07d58a5d041395d3d6317ab3aef31c0087285e)
==========

to

==========
Merge M56:Trim AV names.

Correctly call trim function from antivirus metrics.

BUG=615154

Review-Url: https://codereview.chromium.org/2635333002
Cr-Commit-Position: refs/heads/master@{#444182}
(cherry picked from commit 1ce0d75da469537fd542b02ed0cf36bd9d95ecb7)

Trim version and extraneus parts from AntiVirus product names.

Some AV products include their version in the product name in WMI which makes
maintaining the list of hashes of product names onerous.

Therefore, trim anything that looks like a version, along with trailing spaces.

BUG=615154
TEST=unit_tests --gtest_filter=AntiVirusMetricsProvider*

Review-Url: https://codereview.chromium.org/2631583002
Cr-Commit-Position: refs/heads/master@{#443594}
(cherry picked from commit da07d58a5d041395d3d6317ab3aef31c0087285e)

Review-Url: https://codereview.chromium.org/2645473003 .
Cr-Commit-Position: refs/branch-heads/2924@{#794}
Cr-Branched-From:
3a87aecc31cd1ffe751dd72c04e5a96a1fc8108a-refs/heads/master@{#433059}
Committed:
https://chromium.googlesource.com/chromium/src/+/1cb5cebfa54152b226f9ec83589d...
==========

[Will Harris, 2017-01-18 19:59:04]

Committed patchset #1 (id:1) manually as
1cb5cebfa54152b226f9ec83589d79af4815c7da.