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

Side by Side Diff: chrome/browser/ui/webui/options/content_settings_exception_area_browsertest.cc

Issue 2579013002: Disable flaky incognito-related tests on Mac ASAN. (Closed)
Patch Set: Created 4 years 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
« no previous file with comments | « chrome/browser/tracing/chrome_tracing_delegate_browsertest.cc ('k') | 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/browser_commands.h" 5 #include "chrome/browser/ui/browser_commands.h"
6 #include "chrome/browser/ui/webui/options/options_ui_browsertest.h" 6 #include "chrome/browser/ui/webui/options/options_ui_browsertest.h"
7 7
8 typedef options::OptionsUIBrowserTest ContentSettingsExceptionsAreaBrowserTest; 8 typedef options::OptionsUIBrowserTest ContentSettingsExceptionsAreaBrowserTest;
9 9
10 // Test that an incognito window can be opened while the exceptions page is 10 // Test that an incognito window can be opened while the exceptions page is
11 // open. If this test fails it could indicate that a new content setting has 11 // open. If this test fails it could indicate that a new content setting has
12 // been added but is not being dealt with correctly by the content settings 12 // been added but is not being dealt with correctly by the content settings
13 // handling WebUI code. 13 // handling WebUI code.
14 #if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
15 // Flaky on ASAN on Mac. See https://crbug.com/674497.
16 #define MAYBE_OpenIncognitoWindow DISABLED_OpenIncognitoWindow
17 #else
18 #define MAYBE_OpenIncognitoWindow OpenIncognitoWindow
19 #endif
14 IN_PROC_BROWSER_TEST_F(ContentSettingsExceptionsAreaBrowserTest, 20 IN_PROC_BROWSER_TEST_F(ContentSettingsExceptionsAreaBrowserTest,
15 OpenIncognitoWindow) { 21 MAYBE_OpenIncognitoWindow) {
16 NavigateToSettingsSubpage("contentExceptions"); 22 NavigateToSettingsSubpage("contentExceptions");
17 chrome::NewIncognitoWindow(browser()); 23 chrome::NewIncognitoWindow(browser());
18 } 24 }
OLDNEW
« no previous file with comments | « chrome/browser/tracing/chrome_tracing_delegate_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698