OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <map> | 5 #include <map> |
6 | 6 |
7 #include "chrome/browser/chrome_notification_types.h" | 7 #include "chrome/browser/chrome_notification_types.h" |
8 #include "chrome/browser/extensions/extension_apitest.h" | 8 #include "chrome/browser/extensions/extension_apitest.h" |
9 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
10 #include "chrome/browser/extensions/extension_util.h" | 10 #include "chrome/browser/extensions/extension_util.h" |
11 #include "chrome/browser/extensions/launch_util.h" | 11 #include "chrome/browser/extensions/launch_util.h" |
12 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
13 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
14 #include "chrome/browser/ui/browser_commands.h" | 14 #include "chrome/browser/ui/browser_commands.h" |
15 #include "chrome/browser/ui/browser_finder.h" | 15 #include "chrome/browser/ui/browser_finder.h" |
16 #include "chrome/browser/ui/browser_iterator.h" | 16 #include "chrome/browser/ui/browser_iterator.h" |
17 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 17 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
18 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
19 #include "chrome/common/extensions/extension_constants.h" | 19 #include "chrome/common/extensions/extension_constants.h" |
20 #include "content/public/test/test_utils.h" | 20 #include "content/public/test/test_utils.h" |
21 #include "extensions/browser/api/management/management_api.h" | 21 #include "extensions/browser/api/management/management_api.h" |
| 22 #include "extensions/browser/extension_dialog_auto_confirm.h" |
22 #include "extensions/browser/extension_system.h" | 23 #include "extensions/browser/extension_system.h" |
23 #include "extensions/browser/test_management_policy.h" | 24 #include "extensions/browser/test_management_policy.h" |
24 #include "extensions/common/manifest.h" | 25 #include "extensions/common/manifest.h" |
25 #include "extensions/test/extension_test_message_listener.h" | 26 #include "extensions/test/extension_test_message_listener.h" |
26 | 27 |
27 using extensions::Extension; | 28 using extensions::Extension; |
28 using extensions::Manifest; | 29 using extensions::Manifest; |
29 | 30 |
30 namespace { | 31 namespace { |
31 | 32 |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 // Disabled: http://crbug.com/174411 | 122 // Disabled: http://crbug.com/174411 |
122 #if defined(OS_WIN) | 123 #if defined(OS_WIN) |
123 #define MAYBE_Uninstall DISABLED_Uninstall | 124 #define MAYBE_Uninstall DISABLED_Uninstall |
124 #else | 125 #else |
125 #define MAYBE_Uninstall Uninstall | 126 #define MAYBE_Uninstall Uninstall |
126 #endif | 127 #endif |
127 | 128 |
128 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, MAYBE_Uninstall) { | 129 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, MAYBE_Uninstall) { |
129 LoadExtensions(); | 130 LoadExtensions(); |
130 // Confirmation dialog will be shown for uninstallations except for self. | 131 // Confirmation dialog will be shown for uninstallations except for self. |
131 extensions::ManagementUninstallFunction::SetAutoConfirmForTest(true); | 132 extensions::ScopedExtensionDialogAutoConfirm auto_confirm( |
| 133 &extensions::g_auto_confirm_uninstall_for_testing, |
| 134 extensions::AUTO_CONFIRM_ACCEPT); |
132 ASSERT_TRUE(RunExtensionSubtest("management/test", "uninstall.html")); | 135 ASSERT_TRUE(RunExtensionSubtest("management/test", "uninstall.html")); |
133 } | 136 } |
134 | 137 |
135 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, CreateAppShortcut) { | 138 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, CreateAppShortcut) { |
136 LoadExtensions(); | 139 LoadExtensions(); |
137 base::FilePath basedir = test_data_dir_.AppendASCII("management"); | 140 base::FilePath basedir = test_data_dir_.AppendASCII("management"); |
138 LoadNamedExtension(basedir, "packaged_app"); | 141 LoadNamedExtension(basedir, "packaged_app"); |
139 | 142 |
140 extensions::ManagementCreateAppShortcutFunction::SetAutoConfirmForTest(true); | 143 extensions::ManagementCreateAppShortcutFunction::SetAutoConfirmForTest(true); |
141 ASSERT_TRUE(RunExtensionSubtest("management/test", | 144 ASSERT_TRUE(RunExtensionSubtest("management/test", |
142 "createAppShortcut.html")); | 145 "createAppShortcut.html")); |
143 } | 146 } |
144 | 147 |
145 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, GenerateAppForLink) { | 148 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, GenerateAppForLink) { |
146 LoadExtensions(); | 149 LoadExtensions(); |
147 ASSERT_TRUE(RunExtensionSubtest("management/test", | 150 ASSERT_TRUE(RunExtensionSubtest("management/test", |
148 "generateAppForLink.html")); | 151 "generateAppForLink.html")); |
149 } | 152 } |
150 | 153 |
151 // Fails often on Windows dbg bots. http://crbug.com/177163 | 154 // Fails often on Windows dbg bots. http://crbug.com/177163 |
152 #if defined(OS_WIN) | 155 #if defined(OS_WIN) |
153 #define MAYBE_ManagementPolicyAllowed DISABLED_ManagementPolicyAllowed | 156 #define MAYBE_ManagementPolicyAllowed DISABLED_ManagementPolicyAllowed |
154 #else | 157 #else |
155 #define MAYBE_ManagementPolicyAllowed ManagementPolicyAllowed | 158 #define MAYBE_ManagementPolicyAllowed ManagementPolicyAllowed |
156 #endif // defined(OS_WIN) | 159 #endif // defined(OS_WIN) |
157 // Tests actions on extensions when no management policy is in place. | 160 // Tests actions on extensions when no management policy is in place. |
158 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, | 161 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, |
159 MAYBE_ManagementPolicyAllowed) { | 162 MAYBE_ManagementPolicyAllowed) { |
160 LoadExtensions(); | 163 LoadExtensions(); |
161 extensions::ManagementUninstallFunction::SetAutoConfirmForTest(true); | 164 extensions::ScopedExtensionDialogAutoConfirm auto_confirm( |
| 165 &extensions::g_auto_confirm_uninstall_for_testing, |
| 166 extensions::AUTO_CONFIRM_ACCEPT); |
162 ExtensionService* service = extensions::ExtensionSystem::Get( | 167 ExtensionService* service = extensions::ExtensionSystem::Get( |
163 browser()->profile())->extension_service(); | 168 browser()->profile())->extension_service(); |
164 EXPECT_TRUE(service->GetExtensionById(extension_ids_["enabled_extension"], | 169 EXPECT_TRUE(service->GetExtensionById(extension_ids_["enabled_extension"], |
165 false)); | 170 false)); |
166 | 171 |
167 // Ensure that all actions are allowed. | 172 // Ensure that all actions are allowed. |
168 extensions::ExtensionSystem::Get( | 173 extensions::ExtensionSystem::Get( |
169 browser()->profile())->management_policy()->UnregisterAllProviders(); | 174 browser()->profile())->management_policy()->UnregisterAllProviders(); |
170 | 175 |
171 ASSERT_TRUE(RunExtensionSubtest("management/management_policy", | 176 ASSERT_TRUE(RunExtensionSubtest("management/management_policy", |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
330 } | 335 } |
331 } | 336 } |
332 | 337 |
333 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, LaunchType) { | 338 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, LaunchType) { |
334 LoadExtensions(); | 339 LoadExtensions(); |
335 base::FilePath basedir = test_data_dir_.AppendASCII("management"); | 340 base::FilePath basedir = test_data_dir_.AppendASCII("management"); |
336 LoadNamedExtension(basedir, "packaged_app"); | 341 LoadNamedExtension(basedir, "packaged_app"); |
337 | 342 |
338 ASSERT_TRUE(RunExtensionSubtest("management/test", "launchType.html")); | 343 ASSERT_TRUE(RunExtensionSubtest("management/test", "launchType.html")); |
339 } | 344 } |
OLD | NEW |