Refactor CRX verification in preparation to support CRX₃ files.

tools/metrics/histograms/enums.xml

Index: tools/metrics/histograms/enums.xml
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
index e7ab6072226259de232d5a86d81b90b7a2263634..3d946ce1318f6342a29a9da70688d995bbd9280b 100644
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -12635,30 +12635,25 @@ uploading your change for review.  These are checked by presubmit scripts.
   <int value="7" label="UTILITY_PROCESS_CRASHED_WHILE_TRYING_TO_INSTALL"/>
   <int value="8" label="CRX_FILE_NOT_READABLE"/>
   <int value="9" label="CRX_HEADER_INVALID"/>
-  <int value="10" label="CRX_MAGIC_NUMBER_INVALID"/>
-  <int value="11" label="CRX_VERSION_NUMBER_INVALID"/>
-  <int value="12" label="CRX_EXCESSIVELY_LARGE_KEY_OR_SIGNATURE"/>
-  <int value="13" label="CRX_ZERO_KEY_LENGTH"/>
-  <int value="14" label="CRX_ZERO_SIGNATURE_LENGTH"/>
-  <int value="15" label="CRX_PUBLIC_KEY_INVALID"/>
-  <int value="16" label="CRX_SIGNATURE_INVALID"/>
-  <int value="17" label="CRX_SIGNATURE_VERIFICATION_INITIALIZATION_FAILED"/>
-  <int value="18" label="CRX_SIGNATURE_VERIFICATION_FAILED"/>
-  <int value="19" label="ERROR_SERIALIZING_MANIFEST_JSON"/>
-  <int value="20" label="ERROR_SAVING_MANIFEST_JSON"/>
-  <int value="21" label="COULD_NOT_READ_IMAGE_DATA_FROM_DISK"/>
-  <int value="22" label="DECODED_IMAGES_DO_NOT_MATCH_THE_MANIFEST"/>
-  <int value="23" label="INVALID_PATH_FOR_BROWSER_IMAGE"/>
-  <int value="24" label="ERROR_REMOVING_OLD_IMAGE_FILE"/>
-  <int value="25" label="INVALID_PATH_FOR_BITMAP_IMAGE"/>
-  <int value="26" label="ERROR_RE_ENCODING_THEME_IMAGE"/>
-  <int value="27" label="ERROR_SAVING_THEME_IMAGE"/>
-  <int value="28" label="COULD_NOT_READ_CATALOG_DATA_FROM_DISK"/>
-  <int value="29" label="INVALID_CATALOG_DATA"/>
-  <int value="30" label="INVALID_PATH_FOR_CATALOG"/>
-  <int value="31" label="ERROR_SERIALIZING_CATALOG"/>
-  <int value="32" label="ERROR_SAVING_CATALOG"/>
-  <int value="33" label="CRX_HASH_VERIFICATION_FAILED"/>
+  <int value="10" label="CRX_FILE_IS_DELTA_UPDATE"/>
+  <int value="11" label="CRX_SIGNATURE_VERIFICATION_INITIALIZATION_FAILED"/>
+  <int value="12" label="CRX_SIGNATURE_VERIFICATION_FAILED"/>
+  <int value="13" label="CRX_EXPECTED_HASH_INVALID"/>
+  <int value="14" label="ERROR_SERIALIZING_MANIFEST_JSON"/>
+  <int value="15" label="ERROR_SAVING_MANIFEST_JSON"/>
+  <int value="16" label="COULD_NOT_READ_IMAGE_DATA_FROM_DISK"/>
+  <int value="17" label="DECODED_IMAGES_DO_NOT_MATCH_THE_MANIFEST"/>
+  <int value="18" label="INVALID_PATH_FOR_BROWSER_IMAGE"/>
+  <int value="19" label="ERROR_REMOVING_OLD_IMAGE_FILE"/>
+  <int value="20" label="INVALID_PATH_FOR_BITMAP_IMAGE"/>
+  <int value="21" label="ERROR_RE_ENCODING_THEME_IMAGE"/>
+  <int value="22" label="ERROR_SAVING_THEME_IMAGE"/>
+  <int value="23" label="COULD_NOT_READ_CATALOG_DATA_FROM_DISK"/>
+  <int value="24" label="INVALID_CATALOG_DATA"/>
+  <int value="25" label="INVALID_PATH_FOR_CATALOG"/>
+  <int value="26" label="ERROR_SERIALIZING_CATALOG"/>
+  <int value="27" label="ERROR_SAVING_CATALOG"/>
+  <int value="28" label="CRX_HASH_VERIFICATION_FAILED"/>
 </enum>
 
 <enum name="ExternalDeviceAction" type="int">