Index: chrome/browser/extensions/extensions_service_unittest.cc |
diff --git a/chrome/browser/extensions/extensions_service_unittest.cc b/chrome/browser/extensions/extensions_service_unittest.cc |
index e2dd98425ea5791149b049756a10f3ab8846031e..e41a84a10f7f87e6708b1667e96ef16b10cb27bd 100644 |
--- a/chrome/browser/extensions/extensions_service_unittest.cc |
+++ b/chrome/browser/extensions/extensions_service_unittest.cc |
@@ -131,7 +131,7 @@ class ExtensionsServiceTest |
profile_.reset(new TestingProfile()); |
service_ = new ExtensionsService(profile_.get(), &loop_, &loop_); |
- service_->set_extensions_enabled(true); |
+ service_->SetExtensionsEnabled(true); |
service_->set_show_extensions_prompts(false); |
// When we start up, we want to make sure there is no external provider, |
@@ -191,7 +191,7 @@ class ExtensionsServiceTest |
} |
void SetExtensionsEnabled(bool enabled) { |
- service_->set_extensions_enabled(enabled); |
+ service_->SetExtensionsEnabled(enabled); |
} |
void SetMockExternalProvider(Extension::Location location, |
@@ -498,8 +498,6 @@ TEST_F(ExtensionsServiceTest, InstallExtension) { |
// Test Packaging and installing an extension. |
// TODO(rafaelw): add more tests for failure cases. |
TEST_F(ExtensionsServiceTest, PackExtension) { |
- SetExtensionsEnabled(true); |
- |
FilePath extensions_path; |
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &extensions_path)); |
extensions_path = extensions_path.AppendASCII("extensions"); |
@@ -530,8 +528,6 @@ TEST_F(ExtensionsServiceTest, PackExtension) { |
// The privkey.pem is a PrivateKey, and the pcks8 -topk8 creates a |
// PrivateKeyInfo ASN.1 structure, we our RSAPrivateKey expects. |
TEST_F(ExtensionsServiceTest, PackExtensionOpenSSLKey) { |
- SetExtensionsEnabled(true); |
- |
FilePath extensions_path; |
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &extensions_path)); |
extensions_path = extensions_path.AppendASCII("extensions"); |
@@ -804,6 +800,9 @@ TEST_F(ExtensionsServiceTest, GenerateID) { |
#if defined(OS_WIN) |
TEST_F(ExtensionsServiceTest, ExternalInstallRegistry) { |
+ // This should all work, even when normal extension installation is disabled. |
+ SetExtensionsEnabled(false); |
+ |
// Verify that starting with no providers loads no extensions. |
service_->Init(); |
loop_.RunAllPending(); |
@@ -1013,4 +1012,14 @@ TEST_F(ExtensionsServiceTest, ExternalInstallPref) { |
extension_path = extension_path.AppendASCII(good_crx); |
EXPECT_FALSE(file_util::PathExists(extension_path)) << |
extension_path.ToWStringHack(); |
+ |
+ // This shouldn't work if extensions are disabled. |
+ SetExtensionsEnabled(false); |
+ |
+ pref_provider->UpdateOrAddExtension(good_crx, "1.0", source_path); |
+ service_->CheckForUpdates(); |
+ loop_.RunAllPending(); |
+ |
+ ASSERT_EQ(0u, loaded_.size()); |
+ ASSERT_EQ(1u, GetErrors().size()); |
} |