diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 00:06:03 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 00:06:03 +0000 |
| commit | 44d62b66db9684253afebe2cd081a4353f0e4fa8 (patch) | |
| tree | be905edef4254ebb0b5f5f478e75413a3adabd2c /chrome/browser/extensions/extension_management_browsertest.cc | |
| parent | f13997395826726311f66b3e44ca8c8cf7a4fc28 (diff) | |
| download | chromium_src-44d62b66db9684253afebe2cd081a4353f0e4fa8.zip chromium_src-44d62b66db9684253afebe2cd081a4353f0e4fa8.tar.gz chromium_src-44d62b66db9684253afebe2cd081a4353f0e4fa8.tar.bz2 | |
Revert 13676 - Revert 131665 - Add a preference for why an extension is disabled.
Doesn't delete the CRXes yet since ExtensionManagementApiEscalationTest needs them.
BUG=121436
TEST=browser_tests
TBR=aa@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9960087
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131678 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_management_browsertest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_management_browsertest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/extensions/extension_management_browsertest.cc b/chrome/browser/extensions/extension_management_browsertest.cc index ec789af..49ec02f 100644 --- a/chrome/browser/extensions/extension_management_browsertest.cc +++ b/chrome/browser/extensions/extension_management_browsertest.cc @@ -139,13 +139,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, DisableEnable) { EXPECT_TRUE(manager->GetBackgroundHostForExtension(extension_id)); // After disabling, the background page should go away. - service->DisableExtension(extension_id); + DisableExtension(extension_id); EXPECT_EQ(size_before, service->extensions()->size()); EXPECT_EQ(1u, service->disabled_extensions()->size()); EXPECT_FALSE(manager->GetBackgroundHostForExtension(extension_id)); // And bring it back. - service->EnableExtension(extension_id); + EnableExtension(extension_id); EXPECT_EQ(size_before + 1, service->extensions()->size()); EXPECT_EQ(0u, service->disabled_extensions()->size()); EXPECT_TRUE(manager->GetBackgroundHostForExtension(extension_id)); @@ -322,7 +322,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, InstallExtension(basedir.AppendASCII("v1.crx"), 1); ASSERT_TRUE(extension); listener1.WaitUntilSatisfied(); - service->DisableExtension(extension->id()); + DisableExtension(extension->id()); ASSERT_EQ(disabled_size_before + 1, service->disabled_extensions()->size()); ASSERT_EQ(enabled_size_before, service->extensions()->size()); ASSERT_EQ("ogjcoiohnmldgjemafoockdghcjciccf", extension->id()); @@ -348,7 +348,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, // The extension should have not made the callback because it is disabled. // When we enabled it, it should then make the callback. ASSERT_FALSE(listener2.was_satisfied()); - service->EnableExtension(extension->id()); + EnableExtension(extension->id()); listener2.WaitUntilSatisfied(); ASSERT_TRUE(notification_listener.started()); ASSERT_TRUE(notification_listener.finished()); @@ -484,7 +484,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalPolicyRefresh) { EXPECT_EQ(Extension::EXTERNAL_POLICY_DOWNLOAD, extension->location()); // Try to disable and uninstall the extension which should fail. - service->DisableExtension(kExtensionId); + DisableExtension(kExtensionId); EXPECT_EQ(size_before + 1, service->extensions()->size()); EXPECT_EQ(0u, service->disabled_extensions()->size()); UninstallExtension(kExtensionId); @@ -576,7 +576,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, PolicyOverridesUserInstall) { EXPECT_TRUE(service->IsExtensionEnabled(kExtensionId)); EXPECT_TRUE(service->disabled_extensions()->is_empty()); - service->DisableExtension(kExtensionId); + DisableExtension(kExtensionId); EXPECT_EQ(1u, service->disabled_extensions()->size()); extension = service->GetExtensionById(kExtensionId, true); EXPECT_TRUE(extension); |