Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(381)

Side by Side Diff: chrome/browser/extensions/api/management/management_apitest.cc

Issue 1148323007: [Extensions] Introduce a ScopedExtensionDialogAutoConfirm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Latest master Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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::ScopedTestDialogAutoConfirm auto_confirm(
133 extensions::ScopedTestDialogAutoConfirm::ACCEPT);
132 ASSERT_TRUE(RunExtensionSubtest("management/test", "uninstall.html")); 134 ASSERT_TRUE(RunExtensionSubtest("management/test", "uninstall.html"));
133 } 135 }
134 136
135 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, CreateAppShortcut) { 137 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, CreateAppShortcut) {
136 LoadExtensions(); 138 LoadExtensions();
137 base::FilePath basedir = test_data_dir_.AppendASCII("management"); 139 base::FilePath basedir = test_data_dir_.AppendASCII("management");
138 LoadNamedExtension(basedir, "packaged_app"); 140 LoadNamedExtension(basedir, "packaged_app");
139 141
140 extensions::ManagementCreateAppShortcutFunction::SetAutoConfirmForTest(true); 142 extensions::ManagementCreateAppShortcutFunction::SetAutoConfirmForTest(true);
141 ASSERT_TRUE(RunExtensionSubtest("management/test", 143 ASSERT_TRUE(RunExtensionSubtest("management/test",
142 "createAppShortcut.html")); 144 "createAppShortcut.html"));
143 } 145 }
144 146
145 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, GenerateAppForLink) { 147 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, GenerateAppForLink) {
146 LoadExtensions(); 148 LoadExtensions();
147 ASSERT_TRUE(RunExtensionSubtest("management/test", 149 ASSERT_TRUE(RunExtensionSubtest("management/test",
148 "generateAppForLink.html")); 150 "generateAppForLink.html"));
149 } 151 }
150 152
151 // Fails often on Windows dbg bots. http://crbug.com/177163 153 // Fails often on Windows dbg bots. http://crbug.com/177163
152 #if defined(OS_WIN) 154 #if defined(OS_WIN)
153 #define MAYBE_ManagementPolicyAllowed DISABLED_ManagementPolicyAllowed 155 #define MAYBE_ManagementPolicyAllowed DISABLED_ManagementPolicyAllowed
154 #else 156 #else
155 #define MAYBE_ManagementPolicyAllowed ManagementPolicyAllowed 157 #define MAYBE_ManagementPolicyAllowed ManagementPolicyAllowed
156 #endif // defined(OS_WIN) 158 #endif // defined(OS_WIN)
157 // Tests actions on extensions when no management policy is in place. 159 // Tests actions on extensions when no management policy is in place.
158 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, 160 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest,
159 MAYBE_ManagementPolicyAllowed) { 161 MAYBE_ManagementPolicyAllowed) {
160 LoadExtensions(); 162 LoadExtensions();
161 extensions::ManagementUninstallFunction::SetAutoConfirmForTest(true); 163 extensions::ScopedTestDialogAutoConfirm auto_confirm(
164 extensions::ScopedTestDialogAutoConfirm::ACCEPT);
162 ExtensionService* service = extensions::ExtensionSystem::Get( 165 ExtensionService* service = extensions::ExtensionSystem::Get(
163 browser()->profile())->extension_service(); 166 browser()->profile())->extension_service();
164 EXPECT_TRUE(service->GetExtensionById(extension_ids_["enabled_extension"], 167 EXPECT_TRUE(service->GetExtensionById(extension_ids_["enabled_extension"],
165 false)); 168 false));
166 169
167 // Ensure that all actions are allowed. 170 // Ensure that all actions are allowed.
168 extensions::ExtensionSystem::Get( 171 extensions::ExtensionSystem::Get(
169 browser()->profile())->management_policy()->UnregisterAllProviders(); 172 browser()->profile())->management_policy()->UnregisterAllProviders();
170 173
171 ASSERT_TRUE(RunExtensionSubtest("management/management_policy", 174 ASSERT_TRUE(RunExtensionSubtest("management/management_policy",
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 } 333 }
331 } 334 }
332 335
333 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, LaunchType) { 336 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, LaunchType) {
334 LoadExtensions(); 337 LoadExtensions();
335 base::FilePath basedir = test_data_dir_.AppendASCII("management"); 338 base::FilePath basedir = test_data_dir_.AppendASCII("management");
336 LoadNamedExtension(basedir, "packaged_app"); 339 LoadNamedExtension(basedir, "packaged_app");
337 340
338 ASSERT_TRUE(RunExtensionSubtest("management/test", "launchType.html")); 341 ASSERT_TRUE(RunExtensionSubtest("management/test", "launchType.html"));
339 } 342 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698