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

Side by Side Diff: chrome/browser/extensions/crx_installer_browsertest.cc

Issue 10829460: Mark ExtensionCrxInstaller.GrantScopes as flaky on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/download/download_crx_util.h" 5 #include "chrome/browser/download/download_crx_util.h"
6 #include "chrome/browser/download/download_service.h" 6 #include "chrome/browser/download/download_service.h"
7 #include "chrome/browser/download/download_service_factory.h" 7 #include "chrome/browser/download/download_service_factory.h"
8 #include "chrome/browser/extensions/crx_installer.h" 8 #include "chrome/browser/extensions/crx_installer.h"
9 #include "chrome/browser/extensions/extension_browsertest.h" 9 #include "chrome/browser/extensions/extension_browsertest.h"
10 #include "chrome/browser/extensions/extension_install_prompt.h" 10 #include "chrome/browser/extensions/extension_install_prompt.h"
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 ui_test_utils::BROWSER_TEST_NONE); 218 ui_test_utils::BROWSER_TEST_NONE);
219 219
220 EXPECT_TRUE(WaitForCrxInstallerDone()); 220 EXPECT_TRUE(WaitForCrxInstallerDone());
221 LOG(ERROR) << "PackAndInstallExtension: Extension install"; 221 LOG(ERROR) << "PackAndInstallExtension: Extension install";
222 EXPECT_TRUE(mock_prompt->confirmation_requested()); 222 EXPECT_TRUE(mock_prompt->confirmation_requested());
223 LOG(ERROR) << "PackAndInstallExtension: Extension install confirmed"; 223 LOG(ERROR) << "PackAndInstallExtension: Extension install confirmed";
224 } 224 }
225 225
226 // Tests that scopes are only granted if |record_oauth2_grant_| on the prompt is 226 // Tests that scopes are only granted if |record_oauth2_grant_| on the prompt is
227 // true. 227 // true.
228 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, GrantScopes) { 228 #if defined(OS_WIN)
229 #define MAYBE_GrantScopes FLAKY_GrantScopes
230 #else
231 #define MAYBE_GrantScopes GrantScopes
232 #endif
233 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, MAYBE_GrantScopes) {
229 EXPECT_NO_FATAL_FAILURE(CheckHasEmptyScopesAfterInstall("browsertest/scopes", 234 EXPECT_NO_FATAL_FAILURE(CheckHasEmptyScopesAfterInstall("browsertest/scopes",
230 true)); 235 true));
231 } 236 }
232 237
233 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, DoNotGrantScopes) { 238 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, DoNotGrantScopes) {
234 EXPECT_NO_FATAL_FAILURE(CheckHasEmptyScopesAfterInstall("browsertest/scopes", 239 EXPECT_NO_FATAL_FAILURE(CheckHasEmptyScopesAfterInstall("browsertest/scopes",
235 false)); 240 false));
236 } 241 }
237 242
238 // Off-store install cannot yet be disabled on Aura. 243 // Off-store install cannot yet be disabled on Aura.
(...skipping 29 matching lines...) Expand all
268 EXPECT_EQ(string16(), mock_prompt->error()) << kTestData[i]; 273 EXPECT_EQ(string16(), mock_prompt->error()) << kTestData[i];
269 } else { 274 } else {
270 EXPECT_EQ(l10n_util::GetStringUTF16( 275 EXPECT_EQ(l10n_util::GetStringUTF16(
271 IDS_EXTENSION_INSTALL_DISALLOWED_ON_SITE), 276 IDS_EXTENSION_INSTALL_DISALLOWED_ON_SITE),
272 mock_prompt->error()) << kTestData[i]; 277 mock_prompt->error()) << kTestData[i];
273 } 278 }
274 } 279 }
275 } 280 }
276 281
277 } // namespace extensions 282 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698