| Index: extensions/browser/extension_registry_unittest.cc
|
| diff --git a/extensions/browser/extension_registry_unittest.cc b/extensions/browser/extension_registry_unittest.cc
|
| index 075019b244c4a4dde186bdf59e0a62422ab450e0..23f63fa7f6fea94669f4dfdfd183154d86146405 100644
|
| --- a/extensions/browser/extension_registry_unittest.cc
|
| +++ b/extensions/browser/extension_registry_unittest.cc
|
| @@ -50,7 +50,7 @@ TEST_F(ExtensionRegistryTest, FillAndClearRegistry) {
|
| }
|
|
|
| // A simple test of adding and removing things from sets.
|
| -TEST_F(ExtensionRegistryTest, AddAndRemoveExtensionFromRegistry) {
|
| +TEST_F(ExtensionRegistryTest, AddExtensionToRegistry) {
|
| ExtensionRegistry registry;
|
|
|
| // Adding an extension works.
|
| @@ -62,13 +62,6 @@ TEST_F(ExtensionRegistryTest, AddAndRemoveExtensionFromRegistry) {
|
| EXPECT_EQ(0u, registry.disabled_extensions().size());
|
| EXPECT_EQ(0u, registry.terminated_extensions().size());
|
| EXPECT_EQ(0u, registry.blacklisted_extensions().size());
|
| -
|
| - // Removing an extension works.
|
| - EXPECT_TRUE(registry.RemoveEnabled(extension->id()));
|
| - EXPECT_EQ(0u, registry.enabled_extensions().size());
|
| -
|
| - // Trying to remove an extension that isn't in the set fails cleanly.
|
| - EXPECT_FALSE(registry.RemoveEnabled(extension->id()));
|
| }
|
|
|
| TEST_F(ExtensionRegistryTest, AddExtensionToRegistryTwice) {
|
| @@ -165,5 +158,55 @@ TEST_F(ExtensionRegistryTest, GetExtensionById) {
|
| "enabled", ExtensionRegistry::DISABLED | ExtensionRegistry::BLACKLISTED));
|
| }
|
|
|
| +TEST_F(ExtensionRegistryTest, UnloadExtension) {
|
| + ExtensionRegistry registry;
|
| + scoped_refptr<Extension> extension = test_util::CreateExtensionWithID("id");
|
| +
|
| + // Unloading an extension removes it from the enabled set.
|
| + registry.AddEnabled(extension);
|
| + ASSERT_EQ(1u, registry.enabled_extensions().size());
|
| + registry.UnloadExtension(extension);
|
| + EXPECT_EQ(0u, registry.enabled_extensions().size());
|
| +
|
| + // Unloading an extension removes it from the disabled set.
|
| + registry.AddDisabled(extension);
|
| + ASSERT_EQ(1u, registry.disabled_extensions().size());
|
| + registry.UnloadExtension(extension);
|
| + EXPECT_EQ(0u, registry.disabled_extensions().size());
|
| +}
|
| +
|
| +TEST_F(ExtensionRegistryTest, EnableExtension) {
|
| + ExtensionRegistry registry;
|
| + scoped_refptr<Extension> extension = test_util::CreateExtensionWithID("id");
|
| +
|
| + // Enabling an extension moves it from disabled to enabled.
|
| + registry.AddDisabled(extension);
|
| + ASSERT_EQ(1u, registry.disabled_extensions().size());
|
| + registry.EnableExtension(extension);
|
| + EXPECT_EQ(1u, registry.enabled_extensions().size());
|
| + EXPECT_EQ(0u, registry.disabled_extensions().size());
|
| +}
|
| +
|
| +TEST_F(ExtensionRegistryTest, DisableExtension) {
|
| + ExtensionRegistry registry;
|
| + scoped_refptr<Extension> extension = test_util::CreateExtensionWithID("id");
|
| +
|
| + // Disabling an extension moves it from enabled to disabled.
|
| + registry.AddEnabled(extension);
|
| + ASSERT_EQ(1u, registry.enabled_extensions().size());
|
| + registry.DisableExtension(extension);
|
| + EXPECT_EQ(0u, registry.enabled_extensions().size());
|
| + EXPECT_EQ(1u, registry.disabled_extensions().size());
|
| +
|
| + registry.ClearAll();
|
| +
|
| + // Disabling an extension moves it from terminated to disabled.
|
| + registry.AddTerminated(extension);
|
| + ASSERT_EQ(1u, registry.terminated_extensions().size());
|
| + registry.DisableExtension(extension);
|
| + EXPECT_EQ(0u, registry.terminated_extensions().size());
|
| + EXPECT_EQ(1u, registry.disabled_extensions().size());
|
| +}
|
| +
|
| } // namespace
|
| } // namespace extensions
|
|
|