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

Unified Diff: chrome/browser/extensions/extension_incognito_apitest.cc

Issue 6399003: DontCreateIncognitoProfile hangs on linux, disabling... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/iframe_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_incognito_apitest.cc
===================================================================
--- chrome/browser/extensions/extension_incognito_apitest.cc (revision 72638)
+++ chrome/browser/extensions/extension_incognito_apitest.cc (working copy)
@@ -81,9 +81,15 @@
EXPECT_TRUE(result);
}
+// http://crbug.com/70913 flaky hangs on linux so disabling.
+#if defined(OS_LINUX)
+#define MAYBE_DontCreateIncognitoProfile DISABLED_DontCreateIncognitoProfile
+#else
+#define MAYBE_DontCreateIncognitoProfile DontCreateIncognitoProfile
+#endif
// Tests that an extension which is enabled for incognito mode doesn't
// accidentially create and incognito profile.
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DontCreateIncognitoProfile) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_DontCreateIncognitoProfile) {
ASSERT_FALSE(browser()->profile()->HasOffTheRecordProfile());
ASSERT_TRUE(RunExtensionTestIncognito(
"incognito/dont_create_profile")) << message_;
@@ -108,16 +114,10 @@
EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
}
-// Hangs flakily on mac and linux: http://crbug.com/53991
-#if defined(OS_MACOSX) || defined(OS_LINUX)
-#define MAYBE_IncognitoSplitMode DISABLED_IncognitoSplitMode
-#else
-#define MAYBE_IncognitoSplitMode IncognitoSplitMode
-#endif
-
// Tests that the APIs in an incognito-enabled split-mode extension work
// properly.
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_IncognitoSplitMode) {
+// Hangs flakily on mac, linux, win: http://crbug.com/53991
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_IncognitoSplitMode) {
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(StartTestServer());
« no previous file with comments | « no previous file | chrome/browser/iframe_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698