Index: chrome/browser/extensions/extension_service_unittest.cc |
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc |
index 30da09b23d9cd39dbc35847c58bf2cd763277f60..1377e9c711f0a63e08c38ff1f3ce7c196fe3f900 100644 |
--- a/chrome/browser/extensions/extension_service_unittest.cc |
+++ b/chrome/browser/extensions/extension_service_unittest.cc |
@@ -4605,8 +4605,13 @@ TEST_F(ExtensionServiceTest, UpgradingRequirementsEnabled) { |
PackCRX(path.AppendASCII("v2_bad_requirements"), |
pem_path, |
v2_bad_requirements_crx); |
- UpdateExtension(id, v2_bad_requirements_crx, INSTALLED); |
- EXPECT_FALSE(service()->IsExtensionEnabled(id)); |
+ if (content::GpuDataManager::GetInstance()->ShouldUseSwiftShader()) { |
+ UpdateExtension(id, v2_bad_requirements_crx, ENABLED); |
+ EXPECT_TRUE(service()->IsExtensionEnabled(id)); |
Devlin
2017/03/02 21:59:29
Unfortunately, this defeats the purpose of the tes
sugoi
2017/03/06 18:31:42
I've looked into this, and I still think this is t
Devlin
2017/03/06 22:58:10
The thing is, this isn't actually a GPU test, WebG
|
+ } else { |
+ UpdateExtension(id, v2_bad_requirements_crx, INSTALLED); |
+ EXPECT_FALSE(service()->IsExtensionEnabled(id)); |
+ } |
base::FilePath v3_good_crx = GetTemporaryFile(); |
@@ -4687,8 +4692,13 @@ TEST_F(ExtensionServiceTest, UnpackedRequirements) { |
data_dir().AppendASCII("requirements").AppendASCII("v2_bad_requirements"); |
extensions::UnpackedInstaller::Create(service())->Load(path); |
base::RunLoop().RunUntilIdle(); |
- EXPECT_EQ(1u, GetErrors().size()); |
- EXPECT_EQ(0u, registry()->enabled_extensions().size()); |
+ if (content::GpuDataManager::GetInstance()->ShouldUseSwiftShader()) { |
+ EXPECT_EQ(0u, GetErrors().size()); |
Devlin
2017/03/02 21:59:29
ditto here
|
+ EXPECT_EQ(1u, registry()->enabled_extensions().size()); |
+ } else { |
+ EXPECT_EQ(1u, GetErrors().size()); |
+ EXPECT_EQ(0u, registry()->enabled_extensions().size()); |
+ } |
} |
class ExtensionCookieCallback { |