| OLD | NEW |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h" | 5 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h" |
| 6 | 6 |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "chrome/browser/extensions/extension_action_test_util.h" | 8 #include "chrome/browser/extensions/extension_action_test_util.h" |
| 9 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
| 10 #include "chrome/browser/extensions/extension_service_test_base.h" | 10 #include "chrome/browser/extensions/extension_service_test_base.h" |
| 11 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h" | 11 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h" |
| 12 #include "chrome/test/base/browser_with_test_window_test.h" | 12 #include "chrome/test/base/browser_with_test_window_test.h" |
| 13 #include "extensions/browser/extension_registry.h" | 13 #include "extensions/browser/extension_registry.h" |
| 14 #include "extensions/common/extension.h" | 14 #include "extensions/common/extension.h" |
| 15 #include "extensions/common/extension_builder.h" | 15 #include "extensions/common/extension_builder.h" |
| 16 #include "extensions/common/manifest_constants.h" | 16 #include "extensions/common/manifest_constants.h" |
| 17 #include "extensions/common/value_builder.h" | 17 #include "extensions/common/value_builder.h" |
| 18 | 18 |
| 19 class ComponentToolbarActionsFactoryTest | 19 class ComponentToolbarActionsFactoryTest |
| 20 : public extensions::ExtensionServiceTestBase { | 20 : public extensions::ExtensionServiceTestBase { |
| 21 public: | 21 public: |
| 22 ComponentToolbarActionsFactoryTest() {} | 22 ComponentToolbarActionsFactoryTest() {} |
| 23 ~ComponentToolbarActionsFactoryTest() override {} | 23 ~ComponentToolbarActionsFactoryTest() override {} |
| 24 | 24 |
| 25 void SetUp() override { | 25 void SetUp() override { |
| 26 extensions::ExtensionServiceTestBase::SetUp(); | 26 extensions::ExtensionServiceTestBase::SetUp(); |
| 27 InitializeEmptyExtensionService(); | 27 InitializeEmptyExtensionService(); |
| 28 actions_factory_ = | 28 actions_factory_ = |
| 29 extensions::extension_action_test_util:: | 29 base::MakeUnique<ComponentToolbarActionsFactory>(profile()); |
| 30 CreateToolbarModelForProfileWithoutWaitingForReady(profile()) | |
| 31 ->component_actions_factory(); | |
| 32 } | 30 } |
| 33 | 31 |
| 34 protected: | 32 protected: |
| 35 scoped_refptr<const extensions::Extension> CreateExtensionWithId( | 33 scoped_refptr<const extensions::Extension> CreateExtensionWithId( |
| 36 const std::string& extension_id) { | 34 const std::string& extension_id) { |
| 37 extensions::DictionaryBuilder manifest; | 35 extensions::DictionaryBuilder manifest; |
| 38 manifest.Set(extensions::manifest_keys::kName, "test name") | 36 manifest.Set(extensions::manifest_keys::kName, "test name") |
| 39 .Set(extensions::manifest_keys::kDescription, "test description") | 37 .Set(extensions::manifest_keys::kDescription, "test description") |
| 40 .Set(extensions::manifest_keys::kManifestVersion, 1) | 38 .Set(extensions::manifest_keys::kManifestVersion, 1) |
| 41 .Set(extensions::manifest_keys::kVersion, "1.0.0") | 39 .Set(extensions::manifest_keys::kVersion, "1.0.0") |
| 42 .Set(extensions::manifest_keys::kBrowserAction, | 40 .Set(extensions::manifest_keys::kBrowserAction, |
| 43 extensions::DictionaryBuilder().Build()); | 41 extensions::DictionaryBuilder().Build()); |
| 44 | 42 |
| 45 return extensions::ExtensionBuilder() | 43 return extensions::ExtensionBuilder() |
| 46 .SetManifest(manifest.Build()) | 44 .SetManifest(manifest.Build()) |
| 47 .SetID(extension_id) | 45 .SetID(extension_id) |
| 48 .SetLocation(extensions::Manifest::INTERNAL) | 46 .SetLocation(extensions::Manifest::INTERNAL) |
| 49 .Build(); | 47 .Build(); |
| 50 } | 48 } |
| 51 | 49 |
| 52 // Adds |extension| and unloads migrated extensions. Returns true if | 50 // Adds |extension| and unloads migrated extensions. Returns true if |
| 53 // |extension| was unloaded. | 51 // |extension| was unloaded. |
| 54 bool TestUnloadingMigratedExtensions( | 52 bool TestUnloadingEnabledMigratedExtension( |
| 55 scoped_refptr<const extensions::Extension> extension) { | 53 scoped_refptr<const extensions::Extension> extension) { |
| 56 service()->AddExtension(extension.get()); | 54 service()->AddExtension(extension.get()); |
| 57 CHECK(registry()->enabled_extensions().Contains(extension->id())); | 55 CHECK(registry()->enabled_extensions().Contains(extension->id())); |
| 58 actions_factory_->UnloadMigratedExtensions(service(), registry()); | 56 actions_factory_->UnloadMigratedExtensions(); |
| 59 return !registry()->enabled_extensions().Contains(extension->id()); | 57 return !registry()->GenerateInstalledExtensionsSet()->Contains( |
| 58 extension->id()); |
| 60 } | 59 } |
| 61 | 60 |
| 62 ComponentToolbarActionsFactory* actions_factory_ = nullptr; | 61 // Adds |extension|, disables it, and unloads migrated extensions. Returns |
| 62 // true if |extension| was unloaded. |
| 63 bool TestUnloadingDisabledMigratedExtension( |
| 64 scoped_refptr<const extensions::Extension> extension) { |
| 65 service()->AddExtension(extension.get()); |
| 66 service()->DisableExtension(extension->id(), |
| 67 extensions::Extension::DISABLE_USER_ACTION); |
| 68 CHECK(!registry()->enabled_extensions().Contains(extension->id())); |
| 69 actions_factory_->UnloadMigratedExtensions(); |
| 70 return !registry()->GenerateInstalledExtensionsSet()->Contains( |
| 71 extension->id()); |
| 72 } |
| 73 |
| 74 std::unique_ptr<ComponentToolbarActionsFactory> actions_factory_; |
| 63 | 75 |
| 64 private: | 76 private: |
| 65 DISALLOW_COPY_AND_ASSIGN(ComponentToolbarActionsFactoryTest); | 77 DISALLOW_COPY_AND_ASSIGN(ComponentToolbarActionsFactoryTest); |
| 66 }; | 78 }; |
| 67 | 79 |
| 68 TEST_F(ComponentToolbarActionsFactoryTest, UnloadMigratedExtensions) { | 80 TEST_F(ComponentToolbarActionsFactoryTest, UnloadMigratedExtensions) { |
| 69 EXPECT_TRUE(TestUnloadingMigratedExtensions( | 81 const std::string non_migrated_extension_id = "not_migrated_extension"; |
| 82 |
| 83 EXPECT_TRUE(TestUnloadingEnabledMigratedExtension( |
| 70 CreateExtensionWithId(ComponentToolbarActionsFactory::kCastExtensionId))); | 84 CreateExtensionWithId(ComponentToolbarActionsFactory::kCastExtensionId))); |
| 71 EXPECT_TRUE(TestUnloadingMigratedExtensions(CreateExtensionWithId( | 85 EXPECT_TRUE(TestUnloadingEnabledMigratedExtension(CreateExtensionWithId( |
| 72 ComponentToolbarActionsFactory::kCastBetaExtensionId))); | 86 ComponentToolbarActionsFactory::kCastBetaExtensionId))); |
| 73 EXPECT_FALSE(TestUnloadingMigratedExtensions( | 87 EXPECT_FALSE(TestUnloadingEnabledMigratedExtension( |
| 74 extensions::extension_action_test_util::CreateActionExtension( | 88 extensions::extension_action_test_util::CreateActionExtension( |
| 75 "not_migrated_extension", | 89 non_migrated_extension_id, |
| 90 extensions::extension_action_test_util::BROWSER_ACTION))); |
| 91 |
| 92 // The behavior should be the same even when the extensions are disabled. |
| 93 EXPECT_TRUE(TestUnloadingDisabledMigratedExtension( |
| 94 CreateExtensionWithId(ComponentToolbarActionsFactory::kCastExtensionId))); |
| 95 EXPECT_TRUE(TestUnloadingDisabledMigratedExtension(CreateExtensionWithId( |
| 96 ComponentToolbarActionsFactory::kCastBetaExtensionId))); |
| 97 EXPECT_FALSE(TestUnloadingDisabledMigratedExtension( |
| 98 extensions::extension_action_test_util::CreateActionExtension( |
| 99 non_migrated_extension_id, |
| 76 extensions::extension_action_test_util::BROWSER_ACTION))); | 100 extensions::extension_action_test_util::BROWSER_ACTION))); |
| 77 } | 101 } |
| 78 | 102 |
| 79 TEST_F(ComponentToolbarActionsFactoryTest, GetInitialIds) { | 103 TEST_F(ComponentToolbarActionsFactoryTest, GetInitialIds) { |
| 80 std::string id1("id1"); | 104 std::string id1("id1"); |
| 81 std::string id2("id2"); | 105 std::string id2("id2"); |
| 82 std::string id3("id3"); | 106 std::string id3("id3"); |
| 83 | 107 |
| 84 actions_factory_->OnAddComponentActionBeforeInit(id1); | 108 actions_factory_->OnAddComponentActionBeforeInit(id1); |
| 85 actions_factory_->OnAddComponentActionBeforeInit(id2); | 109 actions_factory_->OnAddComponentActionBeforeInit(id2); |
| 86 actions_factory_->OnAddComponentActionBeforeInit(id3); | 110 actions_factory_->OnAddComponentActionBeforeInit(id3); |
| 87 actions_factory_->OnRemoveComponentActionBeforeInit(id2); | 111 actions_factory_->OnRemoveComponentActionBeforeInit(id2); |
| 88 | 112 |
| 89 std::set<std::string> initial_ids = | 113 std::set<std::string> initial_ids = |
| 90 actions_factory_->GetInitialComponentIds(); | 114 actions_factory_->GetInitialComponentIds(); |
| 91 EXPECT_TRUE(base::ContainsKey(initial_ids, id1)); | 115 EXPECT_TRUE(base::ContainsKey(initial_ids, id1)); |
| 92 EXPECT_FALSE(base::ContainsKey(initial_ids, id2)); | 116 EXPECT_FALSE(base::ContainsKey(initial_ids, id2)); |
| 93 EXPECT_TRUE(base::ContainsKey(initial_ids, id3)); | 117 EXPECT_TRUE(base::ContainsKey(initial_ids, id3)); |
| 94 } | 118 } |
| OLD | NEW |