DNR: Rename RulesetMatcher::kLoadErrorRulesetVerification.

The enum value RulesetMatcher::kLoadErrorRulesetVerification is ambiguous and
doesn't clarify the failure reason. Rename it to
RulesetMatcher::kLoadErrorChecksumMismatch.

BUG=None

Change-Id: I451221e9a5a67181ecfc599563ff7a3e7f5d72f2
Reviewed-on: https://chromium-review.googlesource.com/1187371
Commit-Queue: Karan Bhatia <karandeepb@chromium.org>
Reviewed-by: Istiaque Ahmed <lazyboy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585647}

chrome/browser/extensions/api/declarative_net_request/declarative_net_request_browsertest.cc

@@ -1838,7 +1838,7 @@ IN_PROC_BROWSER_TEST_P(DeclarativeNetRequestBrowserTest_Packed,
     EXPECT_EQ(1, tester.GetBucketCount(
                      "Extensions.DeclarativeNetRequest.LoadRulesetResult",
                      RulesetMatcher::LoadRulesetResult::
-                         kLoadErrorRulesetVerification /*sample*/));
+                         kLoadErrorChecksumMismatch /*sample*/));
     EXPECT_EQ(1,
               tester.GetBucketCount(
                   "Extensions.DeclarativeNetRequest.LoadRulesetResult",
@@ -1898,7 +1898,7 @@ IN_PROC_BROWSER_TEST_P(DeclarativeNetRequestBrowserTest,
   EXPECT_EQ(1, tester.GetBucketCount(
                    "Extensions.DeclarativeNetRequest.LoadRulesetResult",
                    RulesetMatcher::LoadRulesetResult::
-                       kLoadErrorRulesetVerification /*sample*/));
+                       kLoadErrorChecksumMismatch /*sample*/));
 
   // Verify that re-indexing the ruleset failed.
   tester.ExpectUniqueSample(

chrome/browser/extensions/api/declarative_net_request/ruleset_matcher_unittest.cc

@@ -146,7 +146,7 @@ TEST_P(RulesetMatcherTest, FailedVerification) {
   data = GetVersionHeaderForTesting() + "invalid data";
   ASSERT_EQ(static_cast<int>(data.size()),
             base::WriteFile(indexed_ruleset_path, data.c_str(), data.size()));
-  EXPECT_EQ(RulesetMatcher::kLoadErrorRulesetVerification,
+  EXPECT_EQ(RulesetMatcher::kLoadErrorChecksumMismatch,
             RulesetMatcher::CreateVerifiedMatcher(indexed_ruleset_path,
                                                   expected_checksum, &matcher));
 }

extensions/browser/api/declarative_net_request/ruleset_matcher.cc

@@ -55,7 +55,7 @@ RulesetMatcher::LoadRulesetResult RulesetMatcher::CreateVerifiedMatcher(
           base::make_span(reinterpret_cast<const uint8_t*>(ruleset_data.data()),
                           ruleset_data.size()),
           expected_ruleset_checksum)) {
-    return kLoadErrorRulesetVerification;
+    return kLoadErrorChecksumMismatch;
   }
 
   UMA_HISTOGRAM_TIMES(

extensions/browser/api/declarative_net_request/ruleset_matcher.h

@@ -49,8 +49,7 @@ class RulesetMatcher {
     kLoadErrorFileRead = 2,
 
     // Ruleset loading failed due to a checksum mismatch.
-    // TODO(karandeepb): Rename this to kLoadErrorChecksumMismatch.
-    kLoadErrorRulesetVerification = 3,
+    kLoadErrorChecksumMismatch = 3,
 
     // Ruleset loading failed due to version header mismatch.
     kLoadErrorVersionMismatch = 4,

tools/metrics/histograms/enums.xml

@@ -27713,7 +27713,7 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="0" label="Load succeeded"/>
   <int value="1" label="Load failed - Invalid path"/>
   <int value="2" label="Load failed - File read error"/>
-  <int value="3" label="Load failed - Ruleset verification error"/>
+  <int value="3" label="Load failed - Checksum mismatch"/>
   <int value="4" label="Load failed - Version mismatch"/>
 </enum>