Remove CRX2 parsers from Chrome.
Unwinds some now-dead policy handling.
Repackages some remaining CRX2 items into CRX3.
Where they had no keys checked in, I created keys are rotated IDs.
For the component updater, I also had to change hash/size constants.
Removes a kiosk browsertest that verified CRX2 compatibility.
Bug: 740715
Change-Id: I3f96ff682400c509ba3050310c3ada3fcf552360
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1729917
Commit-Queue: Joshua Pawlicki <[email protected]>
Reviewed-by: Sergey Poromov <[email protected]>
Reviewed-by: Dominic Battré <[email protected]>
Reviewed-by: Denis Kuznetsov <[email protected]>
Reviewed-by: Alexander Alekseev <[email protected]>
Reviewed-by: proberge <[email protected]>
Reviewed-by: Devlin <[email protected]>
Reviewed-by: John Chen <[email protected]>
Auto-Submit: Joshua Pawlicki <[email protected]>
Cr-Commit-Position: refs/heads/master@{#692756}
diff --git a/components/update_client/update_client_unittest.cc b/components/update_client/update_client_unittest.cc
index 2a614f4..c986dd6 100644
--- a/components/update_client/update_client_unittest.cc
+++ b/components/update_client/update_client_unittest.cc
@@ -226,7 +226,7 @@
crx.pk_hash.assign(jebg_hash, jebg_hash + base::size(jebg_hash));
crx.version = base::Version("0.9");
crx.installer = base::MakeRefCounted<TestInstaller>();
- crx.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx.crx_format_requirement = crx_file::VerifierFormat::CRX3;
std::vector<base::Optional<CrxComponent>> component = {crx};
return component;
}
@@ -338,14 +338,14 @@
crx1.pk_hash.assign(jebg_hash, jebg_hash + base::size(jebg_hash));
crx1.version = base::Version("0.9");
crx1.installer = base::MakeRefCounted<TestInstaller>();
- crx1.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx1.crx_format_requirement = crx_file::VerifierFormat::CRX3;
CrxComponent crx2;
crx2.name = "test_abag";
crx2.pk_hash.assign(abag_hash, abag_hash + base::size(abag_hash));
crx2.version = base::Version("2.2");
crx2.installer = base::MakeRefCounted<TestInstaller>();
- crx2.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx2.crx_format_requirement = crx_file::VerifierFormat::CRX3;
return {crx1, crx2};
}
@@ -387,8 +387,8 @@
<manifest version='1.0' prodversionmin='11.0.1.0'>
<packages>
<package name='jebgalgnebhfojomionfpkfelancnnkf.crx'
- hash_sha256='6fc4b93fd11134de1300c2c0bb88c12b644a4ec0fd
- 7c9b12cb7cc067667bde87'/>
+ hash_sha256='7ab32f071cd9b5ef8e0d7913be161f532d98b3e9f
+ a284a7cd8059c3409ce0498'/>
</packages>
</manifest>
</updatecheck>
@@ -411,7 +411,7 @@
ProtocolParser::Result::Manifest::Package package;
package.name = "jebgalgnebhfojomionfpkfelancnnkf.crx";
package.hash_sha256 =
- "6fc4b93fd11134de1300c2c0bb88c12b644a4ec0fd7c9b12cb7cc067667bde87";
+ "7ab32f071cd9b5ef8e0d7913be161f532d98b3e9fa284a7cd8059c3409ce0498";
ProtocolParser::Result result;
result.extension_id = "jebgalgnebhfojomionfpkfelancnnkf";
@@ -555,14 +555,14 @@
crx1.pk_hash.assign(jebg_hash, jebg_hash + base::size(jebg_hash));
crx1.version = base::Version("0.9");
crx1.installer = base::MakeRefCounted<TestInstaller>();
- crx1.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx1.crx_format_requirement = crx_file::VerifierFormat::CRX3;
CrxComponent crx2;
crx2.name = "test_abag";
crx2.pk_hash.assign(abag_hash, abag_hash + base::size(abag_hash));
crx2.version = base::Version("2.2");
crx2.installer = base::MakeRefCounted<TestInstaller>();
- crx2.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx2.crx_format_requirement = crx_file::VerifierFormat::CRX3;
return {crx1, crx2};
}
@@ -604,8 +604,8 @@
<manifest version='1.0' prodversionmin='11.0.1.0'>
<packages>
<package name='jebgalgnebhfojomionfpkfelancnnkf.crx'
- hash_sha256='6fc4b93fd11134de1300c2c0bb88c12b644a4ec0fd
- 7c9b12cb7cc067667bde87'/>
+ hash_sha256='7ab32f071cd9b5ef8e0d7913be161f532d98b3e9f
+ a284a7cd8059c3409ce0498'/>
</packages>
</manifest>
</updatecheck>
@@ -625,7 +625,7 @@
ProtocolParser::Result::Manifest::Package package;
package.name = "jebgalgnebhfojomionfpkfelancnnkf.crx";
package.hash_sha256 =
- "6fc4b93fd11134de1300c2c0bb88c12b644a4ec0fd7c9b12cb7cc067667bde87";
+ "7ab32f071cd9b5ef8e0d7913be161f532d98b3e9fa284a7cd8059c3409ce0498";
ProtocolParser::Result result;
result.extension_id = "jebgalgnebhfojomionfpkfelancnnkf";
@@ -771,7 +771,7 @@
crx.pk_hash.assign(jebg_hash, jebg_hash + base::size(jebg_hash));
crx.version = base::Version("0.9");
crx.installer = base::MakeRefCounted<TestInstaller>();
- crx.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx.crx_format_requirement = crx_file::VerifierFormat::CRX3;
return {crx, base::nullopt};
}
};
@@ -812,8 +812,8 @@
<manifest version='1.0' prodversionmin='11.0.1.0'>
<packages>
<package name='jebgalgnebhfojomionfpkfelancnnkf.crx'
- hash_sha256='6fc4b93fd11134de1300c2c0bb88c12b644a4ec0fd
- 7c9b12cb7cc067667bde87'/>
+ hash_sha256='7ab32f071cd9b5ef8e0d7913be161f532d98b3e9f
+ a284a7cd8059c3409ce0498'/>
</packages>
</manifest>
</updatecheck>
@@ -833,7 +833,7 @@
ProtocolParser::Result::Manifest::Package package;
package.name = "jebgalgnebhfojomionfpkfelancnnkf.crx";
package.hash_sha256 =
- "6fc4b93fd11134de1300c2c0bb88c12b644a4ec0fd7c9b12cb7cc067667bde87";
+ "7ab32f071cd9b5ef8e0d7913be161f532d98b3e9fa284a7cd8059c3409ce0498";
ProtocolParser::Result result;
result.extension_id = id;
@@ -1059,14 +1059,14 @@
crx1.pk_hash.assign(jebg_hash, jebg_hash + base::size(jebg_hash));
crx1.version = base::Version("0.9");
crx1.installer = base::MakeRefCounted<TestInstaller>();
- crx1.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx1.crx_format_requirement = crx_file::VerifierFormat::CRX3;
CrxComponent crx2;
crx2.name = "test_ihfo";
crx2.pk_hash.assign(ihfo_hash, ihfo_hash + base::size(ihfo_hash));
crx2.version = base::Version("0.8");
crx2.installer = base::MakeRefCounted<TestInstaller>();
- crx2.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx2.crx_format_requirement = crx_file::VerifierFormat::CRX3;
return {crx1, crx2};
}
@@ -1108,8 +1108,8 @@
<manifest version='1.0' prodversionmin='11.0.1.0'>
<packages>
<package name='jebgalgnebhfojomionfpkfelancnnkf.crx'
- hash_sha256='6fc4b93fd11134de1300c2c0bb88c12b644a4ec0fd
- 7c9b12cb7cc067667bde87'/>
+ hash_sha256='7ab32f071cd9b5ef8e0d7913be161f532d98b3e9f
+ a284a7cd8059c3409ce0498'/>
</packages>
</manifest>
</updatecheck>
@@ -1122,8 +1122,8 @@
<manifest version='1.0' prodversionmin='11.0.1.0'>
<packages>
<package name='ihfokbkgjpifnbbojhneepfflplebdkc_1.crx'
- hash_sha256='813c59747e139a608b3b5fc49633affc6db574373f
- 309f156ea6d27229c0b3f9'/>
+ hash_sha256='8f5aa190311237cae00675af87ff457f278cd1a05
+ 895470ac5d46647d4a3c2ea'/>
</packages>
</manifest>
</updatecheck>
@@ -1144,7 +1144,7 @@
ProtocolParser::Result::Manifest::Package package;
package.name = "jebgalgnebhfojomionfpkfelancnnkf.crx";
package.hash_sha256 =
- "6fc4b93fd11134de1300c2c0bb88c12b644a4ec0fd7c9b12cb7cc067667bde87";
+ "7ab32f071cd9b5ef8e0d7913be161f532d98b3e9fa284a7cd8059c3409ce0498";
ProtocolParser::Result result;
result.extension_id = id;
@@ -1164,7 +1164,7 @@
ProtocolParser::Result::Manifest::Package package;
package.name = "ihfokbkgjpifnbbojhneepfflplebdkc_1.crx";
package.hash_sha256 =
- "813c59747e139a608b3b5fc49633affc6db574373f309f156ea6d27229c0b3f9";
+ "8f5aa190311237cae00675af87ff457f278cd1a05895470ac5d46647d4a3c2ea";
ProtocolParser::Result result;
result.extension_id = id;
@@ -1334,7 +1334,7 @@
crx.name = "test_ihfo";
crx.pk_hash.assign(ihfo_hash, ihfo_hash + base::size(ihfo_hash));
crx.installer = installer;
- crx.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx.crx_format_requirement = crx_file::VerifierFormat::CRX3;
if (num_calls == 1) {
crx.version = base::Version("0.8");
} else if (num_calls == 2) {
@@ -1405,7 +1405,7 @@
ProtocolParser::Result::Manifest::Package package;
package.name = "ihfokbkgjpifnbbojhneepfflplebdkc_1.crx";
package.hash_sha256 =
- "813c59747e139a608b3b5fc49633affc6db574373f309f156ea6d27229c0b3f9";
+ "8f5aa190311237cae00675af87ff457f278cd1a05895470ac5d46647d4a3c2ea";
ProtocolParser::Result result;
result.extension_id = id;
@@ -1430,11 +1430,11 @@
<packages>
<package name='ihfokbkgjpifnbbojhneepfflplebdkc_2.crx'
namediff='ihfokbkgjpifnbbojhneepfflplebdkc_1to2.crx'
- hash_sha256='1af337fbd19c72db0f870753bcd7711c3ae9dcaa
- 0ecde26c262bad942b112990'
+ hash_sha256='c87d8742c3ff3d7a0cb6f3c91aa2fcf3dea6361
+ 8086a7db1c5be5300e1d4d6b6'
fp='22'
- hashdiff_sha256='73c6e2d4f783fc4ca5481e89e0b8bfce7aec
- 8ead3686290c94792658ec06f2f2'/>
+ hashdiff_sha256='0fd48a5dd87006a709756cfc47198cbc4c4
+ 928f33ac4277d79573c15164a33eb'/>
</packages>
</manifest>
</updatecheck>
@@ -1449,9 +1449,9 @@
package.name = "ihfokbkgjpifnbbojhneepfflplebdkc_2.crx";
package.namediff = "ihfokbkgjpifnbbojhneepfflplebdkc_1to2.crx";
package.hash_sha256 =
- "1af337fbd19c72db0f870753bcd7711c3ae9dcaa0ecde26c262bad942b112990";
+ "c87d8742c3ff3d7a0cb6f3c91aa2fcf3dea63618086a7db1c5be5300e1d4d6b6";
package.hashdiff_sha256 =
- "73c6e2d4f783fc4ca5481e89e0b8bfce7aec8ead3686290c94792658ec06f2f2";
+ "0fd48a5dd87006a709756cfc47198cbc4c4928f33ac4277d79573c15164a33eb";
package.fingerprint = "22";
ProtocolParser::Result result;
@@ -1670,7 +1670,7 @@
crx.pk_hash.assign(jebg_hash, jebg_hash + base::size(jebg_hash));
crx.version = base::Version("0.9");
crx.installer = installer;
- crx.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx.crx_format_requirement = crx_file::VerifierFormat::CRX3;
return {crx};
}
@@ -1712,8 +1712,8 @@
<manifest version='1.0' prodversionmin='11.0.1.0'>
<packages>
<package name='jebgalgnebhfojomionfpkfelancnnkf.crx'
- hash_sha256='6fc4b93fd11134de1300c2c0bb88c12b644a4ec0fd
- 7c9b12cb7cc067667bde87'/>
+ hash_sha256='7ab32f071cd9b5ef8e0d7913be161f532d98b3e9f
+ a284a7cd8059c3409ce0498'/>
</packages>
</manifest>
</updatecheck>
@@ -1729,7 +1729,7 @@
ProtocolParser::Result::Manifest::Package package;
package.name = "jebgalgnebhfojomionfpkfelancnnkf.crx";
package.hash_sha256 =
- "6fc4b93fd11134de1300c2c0bb88c12b644a4ec0fd7c9b12cb7cc067667bde87";
+ "7ab32f071cd9b5ef8e0d7913be161f532d98b3e9fa284a7cd8059c3409ce0498";
ProtocolParser::Result result;
result.extension_id = id;
@@ -1855,7 +1855,7 @@
crx.name = "test_ihfo";
crx.pk_hash.assign(ihfo_hash, ihfo_hash + base::size(ihfo_hash));
crx.installer = installer;
- crx.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx.crx_format_requirement = crx_file::VerifierFormat::CRX3;
if (num_calls == 1) {
crx.version = base::Version("0.8");
} else if (num_calls == 2) {
@@ -1927,7 +1927,7 @@
ProtocolParser::Result::Manifest::Package package;
package.name = "ihfokbkgjpifnbbojhneepfflplebdkc_1.crx";
package.hash_sha256 =
- "813c59747e139a608b3b5fc49633affc6db574373f309f156ea6d27229c0b3f9";
+ "8f5aa190311237cae00675af87ff457f278cd1a05895470ac5d46647d4a3c2ea";
package.fingerprint = "1";
ProtocolParser::Result result;
@@ -1953,11 +1953,11 @@
<packages>
<package name='ihfokbkgjpifnbbojhneepfflplebdkc_2.crx'
namediff='ihfokbkgjpifnbbojhneepfflplebdkc_1to2.crx'
- hash_sha256='1af337fbd19c72db0f870753bcd7711c3ae9dcaa
- 0ecde26c262bad942b112990'
+ hash_sha256='c87d8742c3ff3d7a0cb6f3c91aa2fcf3dea6361
+ 8086a7db1c5be5300e1d4d6b6'
fp='22'
- hashdiff_sha256='73c6e2d4f783fc4ca5481e89e0b8bfce7aec
- 8ead3686290c94792658ec06f2f2'/>
+ hashdiff_sha256='0fd48a5dd87006a709756cfc47198cbc4c4
+ 928f33ac4277d79573c15164a33eb'/>
</packages>
</manifest>
</updatecheck>
@@ -1972,9 +1972,9 @@
package.name = "ihfokbkgjpifnbbojhneepfflplebdkc_2.crx";
package.namediff = "ihfokbkgjpifnbbojhneepfflplebdkc_1to2.crx";
package.hash_sha256 =
- "1af337fbd19c72db0f870753bcd7711c3ae9dcaa0ecde26c262bad942b112990";
+ "c87d8742c3ff3d7a0cb6f3c91aa2fcf3dea63618086a7db1c5be5300e1d4d6b6";
package.hashdiff_sha256 =
- "73c6e2d4f783fc4ca5481e89e0b8bfce7aec8ead3686290c94792658ec06f2f2";
+ "0fd48a5dd87006a709756cfc47198cbc4c4928f33ac4277d79573c15164a33eb";
package.fingerprint = "22";
ProtocolParser::Result result;
@@ -2159,7 +2159,7 @@
crx.pk_hash.assign(jebg_hash, jebg_hash + base::size(jebg_hash));
crx.version = base::Version("0.9");
crx.installer = base::MakeRefCounted<TestInstaller>();
- crx.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx.crx_format_requirement = crx_file::VerifierFormat::CRX3;
return {crx};
}
};
@@ -2280,7 +2280,7 @@
crx.pk_hash.assign(jebg_hash, jebg_hash + base::size(jebg_hash));
crx.version = base::Version("0.0");
crx.installer = base::MakeRefCounted<TestInstaller>();
- crx.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx.crx_format_requirement = crx_file::VerifierFormat::CRX3;
return {crx};
}
};
@@ -2321,8 +2321,8 @@
<manifest version='1.0' prodversionmin='11.0.1.0'>
<packages>
<package name='jebgalgnebhfojomionfpkfelancnnkf.crx'
- hash_sha256='6fc4b93fd11134de1300c2c0bb88c12b644a4ec0fd
- 7c9b12cb7cc067667bde87'/>
+ hash_sha256='7ab32f071cd9b5ef8e0d7913be161f532d98b3e9f
+ a284a7cd8059c3409ce0498'/>
</packages>
</manifest>
</updatecheck>
@@ -2340,7 +2340,7 @@
ProtocolParser::Result::Manifest::Package package;
package.name = "jebgalgnebhfojomionfpkfelancnnkf.crx";
package.hash_sha256 =
- "6fc4b93fd11134de1300c2c0bb88c12b644a4ec0fd7c9b12cb7cc067667bde87";
+ "7ab32f071cd9b5ef8e0d7913be161f532d98b3e9fa284a7cd8059c3409ce0498";
ProtocolParser::Result result;
result.extension_id = id;
@@ -2563,7 +2563,7 @@
crx.pk_hash.assign(jebg_hash, jebg_hash + base::size(jebg_hash));
crx.version = base::Version("0.0");
crx.installer = base::MakeRefCounted<TestInstaller>();
- crx.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx.crx_format_requirement = crx_file::VerifierFormat::CRX3;
return {crx};
}
};
@@ -2831,7 +2831,7 @@
crx.pk_hash.assign(jebg_hash, jebg_hash + base::size(jebg_hash));
crx.version = base::Version("0.9");
crx.installer = base::MakeRefCounted<TestInstaller>();
- crx.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx.crx_format_requirement = crx_file::VerifierFormat::CRX3;
return {crx};
}
};
@@ -3025,7 +3025,7 @@
crx1.pk_hash.assign(jebg_hash, jebg_hash + base::size(jebg_hash));
crx1.version = base::Version("0.9");
crx1.installer = base::MakeRefCounted<TestInstaller>();
- crx1.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx1.crx_format_requirement = crx_file::VerifierFormat::CRX3;
crx1.supports_group_policy_enable_component_updates = true;
CrxComponent crx2;
@@ -3033,7 +3033,7 @@
crx2.pk_hash.assign(ihfo_hash, ihfo_hash + base::size(ihfo_hash));
crx2.version = base::Version("0.8");
crx2.installer = base::MakeRefCounted<TestInstaller>();
- crx2.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx2.crx_format_requirement = crx_file::VerifierFormat::CRX3;
return {crx1, crx2};
}
@@ -3075,8 +3075,8 @@
<manifest version='1.0' prodversionmin='11.0.1.0'>
<packages>
<package name='jebgalgnebhfojomionfpkfelancnnkf.crx'
- hash_sha256='6fc4b93fd11134de1300c2c0bb88c12b644a4ec0fd
- 7c9b12cb7cc067667bde87'/>
+ hash_sha256='7ab32f071cd9b5ef8e0d7913be161f532d98b3e9f
+ a284a7cd8059c3409ce0498'/>
</packages>
</manifest>
</updatecheck>
@@ -3089,8 +3089,8 @@
<manifest version='1.0' prodversionmin='11.0.1.0'>
<packages>
<package name='ihfokbkgjpifnbbojhneepfflplebdkc_1.crx'
- hash_sha256='813c59747e139a608b3b5fc49633affc6db574373f
- 309f156ea6d27229c0b3f9'/>
+ hash_sha256='8f5aa190311237cae00675af87ff457f278cd1a05
+ 895470ac5d46647d4a3c2ea'/>
</packages>
</manifest>
</updatecheck>
@@ -3115,7 +3115,7 @@
ProtocolParser::Result::Manifest::Package package;
package.name = "jebgalgnebhfojomionfpkfelancnnkf.crx";
package.hash_sha256 =
- "6fc4b93fd11134de1300c2c0bb88c12b644a4ec0fd7c9b12cb7cc067667bde87";
+ "7ab32f071cd9b5ef8e0d7913be161f532d98b3e9fa284a7cd8059c3409ce0498";
ProtocolParser::Result result;
result.extension_id = id;
@@ -3135,7 +3135,7 @@
ProtocolParser::Result::Manifest::Package package;
package.name = "ihfokbkgjpifnbbojhneepfflplebdkc_1.crx";
package.hash_sha256 =
- "813c59747e139a608b3b5fc49633affc6db574373f309f156ea6d27229c0b3f9";
+ "8f5aa190311237cae00675af87ff457f278cd1a05895470ac5d46647d4a3c2ea";
ProtocolParser::Result result;
result.extension_id = id;
@@ -3281,7 +3281,7 @@
crx.pk_hash.assign(jebg_hash, jebg_hash + base::size(jebg_hash));
crx.version = base::Version("0.9");
crx.installer = base::MakeRefCounted<TestInstaller>();
- crx.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx.crx_format_requirement = crx_file::VerifierFormat::CRX3;
return {crx};
}
};
@@ -3393,7 +3393,7 @@
crx.pk_hash.assign(jebg_hash, jebg_hash + base::size(jebg_hash));
crx.version = base::Version("0.9");
crx.installer = base::MakeRefCounted<TestInstaller>();
- crx.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx.crx_format_requirement = crx_file::VerifierFormat::CRX3;
component.push_back(crx);
}
{
@@ -3402,7 +3402,7 @@
crx.pk_hash.assign(abag_hash, abag_hash + base::size(abag_hash));
crx.version = base::Version("0.1");
crx.installer = base::MakeRefCounted<TestInstaller>();
- crx.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx.crx_format_requirement = crx_file::VerifierFormat::CRX3;
component.push_back(crx);
}
{
@@ -3411,7 +3411,7 @@
crx.pk_hash.assign(ihfo_hash, ihfo_hash + base::size(ihfo_hash));
crx.version = base::Version("0.2");
crx.installer = base::MakeRefCounted<TestInstaller>();
- crx.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx.crx_format_requirement = crx_file::VerifierFormat::CRX3;
component.push_back(crx);
}
{
@@ -3420,7 +3420,7 @@
crx.pk_hash.assign(gjpm_hash, gjpm_hash + base::size(gjpm_hash));
crx.version = base::Version("0.3");
crx.installer = base::MakeRefCounted<TestInstaller>();
- crx.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx.crx_format_requirement = crx_file::VerifierFormat::CRX3;
component.push_back(crx);
}
return component;
@@ -3761,7 +3761,7 @@
crx.pk_hash.assign(gjpm_hash, gjpm_hash + base::size(gjpm_hash));
crx.version = base::Version("0.0");
crx.installer = base::MakeRefCounted<VersionedTestInstaller>();
- crx.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx.crx_format_requirement = crx_file::VerifierFormat::CRX3;
return std::vector<base::Optional<CrxComponent>>{crx};
}),
base::BindOnce(
@@ -3869,8 +3869,7 @@
std::vector<uint8_t>(std::begin(gjpm_hash), std::end(gjpm_hash)),
TestFilePath("runaction_test_win.crx3"), nullptr,
config->GetUnzipperFactory()->Create(),
- config->GetPatcherFactory()->Create(),
- crx_file::VerifierFormat::CRX2_OR_CRX3);
+ config->GetPatcherFactory()->Create(), crx_file::VerifierFormat::CRX3);
component_unpacker->Unpack(base::BindOnce(
[](base::FilePath* unpack_path, base::OnceClosure quit_closure,
@@ -3913,7 +3912,7 @@
crx.version = base::Version("1.0");
crx.installer =
base::MakeRefCounted<ReadOnlyTestInstaller>(unpack_path);
- crx.crx_format_requirement = crx_file::VerifierFormat::CRX2_OR_CRX3;
+ crx.crx_format_requirement = crx_file::VerifierFormat::CRX3;
return std::vector<base::Optional<CrxComponent>>{crx};
},
unpack_path),
