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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include "base/callback.h" | 7 #include "base/callback.h" |
8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "base/prefs/scoped_user_pref_update.h" | |
13 #include "base/strings/string16.h" | 12 #include "base/strings/string16.h" |
14 #include "base/strings/stringprintf.h" | 13 #include "base/strings/stringprintf.h" |
15 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" | 14 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" |
16 #include "chrome/browser/extensions/extension_action_manager.h" | 15 #include "chrome/browser/extensions/extension_action_manager.h" |
17 #include "chrome/browser/extensions/extension_action_test_util.h" | 16 #include "chrome/browser/extensions/extension_action_test_util.h" |
18 #include "chrome/browser/extensions/extension_service.h" | 17 #include "chrome/browser/extensions/extension_service.h" |
19 #include "chrome/browser/extensions/extension_service_test_base.h" | 18 #include "chrome/browser/extensions/extension_service_test_base.h" |
20 #include "chrome/browser/extensions/extension_util.h" | 19 #include "chrome/browser/extensions/extension_util.h" |
21 #include "chrome/browser/extensions/test_extension_dir.h" | 20 #include "chrome/browser/extensions/test_extension_dir.h" |
22 #include "chrome/browser/extensions/test_extension_system.h" | 21 #include "chrome/browser/extensions/test_extension_system.h" |
23 #include "chrome/browser/extensions/unpacked_installer.h" | 22 #include "chrome/browser/extensions/unpacked_installer.h" |
24 #include "chrome/browser/profiles/profile.h" | 23 #include "chrome/browser/profiles/profile.h" |
25 #include "chrome/browser/sessions/session_tab_helper.h" | 24 #include "chrome/browser/sessions/session_tab_helper.h" |
26 #include "chrome/browser/ui/extensions/extension_toolbar_icon_surfacing_bubble_d
elegate.h" | 25 #include "chrome/browser/ui/extensions/extension_toolbar_icon_surfacing_bubble_d
elegate.h" |
27 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h" | 26 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h" |
28 #include "chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h" | 27 #include "chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h" |
29 #include "chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h" | 28 #include "chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h" |
30 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h" | 29 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h" |
31 #include "chrome/common/extensions/api/extension_action/action_info.h" | 30 #include "chrome/common/extensions/api/extension_action/action_info.h" |
32 #include "chrome/common/pref_names.h" | 31 #include "chrome/common/pref_names.h" |
33 #include "components/crx_file/id_util.h" | 32 #include "components/crx_file/id_util.h" |
| 33 #include "components/prefs/scoped_user_pref_update.h" |
34 #include "content/public/test/test_renderer_host.h" | 34 #include "content/public/test/test_renderer_host.h" |
35 #include "content/public/test/web_contents_tester.h" | 35 #include "content/public/test/web_contents_tester.h" |
36 #include "extensions/browser/extension_prefs.h" | 36 #include "extensions/browser/extension_prefs.h" |
37 #include "extensions/browser/extension_registry.h" | 37 #include "extensions/browser/extension_registry.h" |
38 #include "extensions/browser/extension_system.h" | 38 #include "extensions/browser/extension_system.h" |
39 #include "extensions/browser/pref_names.h" | 39 #include "extensions/browser/pref_names.h" |
40 #include "extensions/browser/test_extension_registry_observer.h" | 40 #include "extensions/browser/test_extension_registry_observer.h" |
41 #include "extensions/browser/uninstall_reason.h" | 41 #include "extensions/browser/uninstall_reason.h" |
42 #include "extensions/common/extension.h" | 42 #include "extensions/common/extension.h" |
43 #include "extensions/common/extension_builder.h" | 43 #include "extensions/common/extension_builder.h" |
(...skipping 1448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1492 } | 1492 } |
1493 | 1493 |
1494 TEST_F(ToolbarActionsModelUnitTest, | 1494 TEST_F(ToolbarActionsModelUnitTest, |
1495 MigrationToExtensionWithoutExtensionActionRedesign) { | 1495 MigrationToExtensionWithoutExtensionActionRedesign) { |
1496 InitForMigrationTest(MigrationStatus::FEATURE_DISABLED_WITH_PREF_TRUE); | 1496 InitForMigrationTest(MigrationStatus::FEATURE_DISABLED_WITH_PREF_TRUE); |
1497 | 1497 |
1498 // Initialization re-enables the extension. | 1498 // Initialization re-enables the extension. |
1499 EXPECT_EQ(1u, num_toolbar_items()); | 1499 EXPECT_EQ(1u, num_toolbar_items()); |
1500 EXPECT_EQ(browser_action_migrated()->id(), GetActionIdAtIndex(0u)); | 1500 EXPECT_EQ(browser_action_migrated()->id(), GetActionIdAtIndex(0u)); |
1501 } | 1501 } |
OLD | NEW |