OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/toolbar_actions_model.h" |
| 6 |
5 #include <stddef.h> | 7 #include <stddef.h> |
6 | 8 |
| 9 #include <memory> |
| 10 |
7 #include "base/callback.h" | 11 #include "base/callback.h" |
8 #include "base/callback_helpers.h" | 12 #include "base/callback_helpers.h" |
9 #include "base/files/file_util.h" | 13 #include "base/files/file_util.h" |
10 #include "base/macros.h" | 14 #include "base/macros.h" |
11 #include "base/memory/ref_counted.h" | 15 #include "base/memory/ref_counted.h" |
12 #include "base/memory/scoped_ptr.h" | |
13 #include "base/strings/string16.h" | 16 #include "base/strings/string16.h" |
14 #include "base/strings/stringprintf.h" | 17 #include "base/strings/stringprintf.h" |
15 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" | 18 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" |
16 #include "chrome/browser/extensions/extension_action_manager.h" | 19 #include "chrome/browser/extensions/extension_action_manager.h" |
17 #include "chrome/browser/extensions/extension_action_test_util.h" | 20 #include "chrome/browser/extensions/extension_action_test_util.h" |
18 #include "chrome/browser/extensions/extension_service.h" | 21 #include "chrome/browser/extensions/extension_service.h" |
19 #include "chrome/browser/extensions/extension_service_test_base.h" | 22 #include "chrome/browser/extensions/extension_service_test_base.h" |
20 #include "chrome/browser/extensions/extension_util.h" | 23 #include "chrome/browser/extensions/extension_util.h" |
21 #include "chrome/browser/extensions/test_extension_dir.h" | 24 #include "chrome/browser/extensions/test_extension_dir.h" |
22 #include "chrome/browser/extensions/test_extension_system.h" | 25 #include "chrome/browser/extensions/test_extension_system.h" |
23 #include "chrome/browser/extensions/unpacked_installer.h" | 26 #include "chrome/browser/extensions/unpacked_installer.h" |
24 #include "chrome/browser/profiles/profile.h" | 27 #include "chrome/browser/profiles/profile.h" |
25 #include "chrome/browser/sessions/session_tab_helper.h" | 28 #include "chrome/browser/sessions/session_tab_helper.h" |
26 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h" | 29 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h" |
27 #include "chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h" | 30 #include "chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h" |
28 #include "chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h" | 31 #include "chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h" |
29 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h" | |
30 #include "chrome/common/extensions/api/extension_action/action_info.h" | 32 #include "chrome/common/extensions/api/extension_action/action_info.h" |
31 #include "chrome/common/pref_names.h" | 33 #include "chrome/common/pref_names.h" |
32 #include "components/crx_file/id_util.h" | 34 #include "components/crx_file/id_util.h" |
33 #include "components/prefs/scoped_user_pref_update.h" | 35 #include "components/prefs/scoped_user_pref_update.h" |
34 #include "content/public/test/test_renderer_host.h" | 36 #include "content/public/test/test_renderer_host.h" |
35 #include "content/public/test/web_contents_tester.h" | 37 #include "content/public/test/web_contents_tester.h" |
36 #include "extensions/browser/extension_prefs.h" | 38 #include "extensions/browser/extension_prefs.h" |
37 #include "extensions/browser/extension_registry.h" | 39 #include "extensions/browser/extension_registry.h" |
38 #include "extensions/browser/extension_system.h" | 40 #include "extensions/browser/extension_system.h" |
39 #include "extensions/browser/pref_names.h" | 41 #include "extensions/browser/pref_names.h" |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
215 private: | 217 private: |
216 // Verifies that all extensions in |extensions| are added successfully. | 218 // Verifies that all extensions in |extensions| are added successfully. |
217 testing::AssertionResult AddAndVerifyExtensions( | 219 testing::AssertionResult AddAndVerifyExtensions( |
218 const extensions::ExtensionList& extensions); | 220 const extensions::ExtensionList& extensions); |
219 | 221 |
220 // The toolbar model associated with the testing profile. | 222 // The toolbar model associated with the testing profile. |
221 ToolbarActionsModel* toolbar_model_; | 223 ToolbarActionsModel* toolbar_model_; |
222 | 224 |
223 // The test observer to track events. Must come after toolbar_model_ so that | 225 // The test observer to track events. Must come after toolbar_model_ so that |
224 // it is destroyed and removes itself as an observer first. | 226 // it is destroyed and removes itself as an observer first. |
225 scoped_ptr<ToolbarActionsModelTestObserver> model_observer_; | 227 std::unique_ptr<ToolbarActionsModelTestObserver> model_observer_; |
226 | 228 |
227 // Sample extensions with only browser actions. | 229 // Sample extensions with only browser actions. |
228 scoped_refptr<const extensions::Extension> browser_action_a_; | 230 scoped_refptr<const extensions::Extension> browser_action_a_; |
229 scoped_refptr<const extensions::Extension> browser_action_b_; | 231 scoped_refptr<const extensions::Extension> browser_action_b_; |
230 scoped_refptr<const extensions::Extension> browser_action_c_; | 232 scoped_refptr<const extensions::Extension> browser_action_c_; |
231 scoped_refptr<const extensions::Extension> browser_action_migrated_; | 233 scoped_refptr<const extensions::Extension> browser_action_migrated_; |
232 | 234 |
233 // Sample extensions with different kinds of actions. | 235 // Sample extensions with different kinds of actions. |
234 scoped_refptr<const extensions::Extension> browser_action_extension_; | 236 scoped_refptr<const extensions::Extension> browser_action_extension_; |
235 scoped_refptr<const extensions::Extension> page_action_extension_; | 237 scoped_refptr<const extensions::Extension> page_action_extension_; |
236 scoped_refptr<const extensions::Extension> no_action_extension_; | 238 scoped_refptr<const extensions::Extension> no_action_extension_; |
237 | 239 |
238 scoped_ptr<MockComponentToolbarActionsFactory> mock_actions_factory_; | 240 std::unique_ptr<MockComponentToolbarActionsFactory> mock_actions_factory_; |
239 | 241 |
240 DISALLOW_COPY_AND_ASSIGN(ToolbarActionsModelUnitTest); | 242 DISALLOW_COPY_AND_ASSIGN(ToolbarActionsModelUnitTest); |
241 }; | 243 }; |
242 | 244 |
243 void ToolbarActionsModelUnitTest::Init() { | 245 void ToolbarActionsModelUnitTest::Init() { |
244 InitializeEmptyExtensionService(); | 246 InitializeEmptyExtensionService(); |
245 toolbar_model_ = | 247 toolbar_model_ = |
246 extensions::extension_action_test_util::CreateToolbarModelForProfile( | 248 extensions::extension_action_test_util::CreateToolbarModelForProfile( |
247 profile()); | 249 profile()); |
248 model_observer_.reset(new ToolbarActionsModelTestObserver(toolbar_model_)); | 250 model_observer_.reset(new ToolbarActionsModelTestObserver(toolbar_model_)); |
(...skipping 1282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1531 } | 1533 } |
1532 | 1534 |
1533 TEST_F(ToolbarActionsModelUnitTest, | 1535 TEST_F(ToolbarActionsModelUnitTest, |
1534 MigrationToExtensionWithoutExtensionActionRedesign) { | 1536 MigrationToExtensionWithoutExtensionActionRedesign) { |
1535 InitForMigrationTest(MigrationStatus::FEATURE_DISABLED_WITH_PREF_TRUE); | 1537 InitForMigrationTest(MigrationStatus::FEATURE_DISABLED_WITH_PREF_TRUE); |
1536 | 1538 |
1537 // Initialization re-enables the extension. | 1539 // Initialization re-enables the extension. |
1538 EXPECT_EQ(1u, num_toolbar_items()); | 1540 EXPECT_EQ(1u, num_toolbar_items()); |
1539 EXPECT_EQ(browser_action_migrated()->id(), GetActionIdAtIndex(0u)); | 1541 EXPECT_EQ(browser_action_migrated()->id(), GetActionIdAtIndex(0u)); |
1540 } | 1542 } |
OLD | NEW |