summaryrefslogtreecommitdiffstats
path: root/chrome/browser/iframe_uitest.cc
diff options
context:
space:
mode:
authorthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-26 17:48:19 +0000
committerthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-26 17:48:19 +0000
commitae3522e835d742994fe5598aa93eedfd278dca77 (patch)
tree6cfedbb3a5dce8425542e0403cce7757a6b96655 /chrome/browser/iframe_uitest.cc
parent4fc461e6d44eeb5aebe18128849fedacedc13525 (diff)
downloadchromium_src-ae3522e835d742994fe5598aa93eedfd278dca77.zip
chromium_src-ae3522e835d742994fe5598aa93eedfd278dca77.tar.gz
chromium_src-ae3522e835d742994fe5598aa93eedfd278dca77.tar.bz2
DontCreateIncognitoProfile hangs on linux, disabling
IncognitoSplitMode is having issues on all OSes now. InEmptyFrame is now having issues on all OSes now. BUG=70192,53991,70913 TEST=see bugs Review URL: http://codereview.chromium.org/6399003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72649 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/iframe_uitest.cc')
-rw-r--r--chrome/browser/iframe_uitest.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/browser/iframe_uitest.cc b/chrome/browser/iframe_uitest.cc
index 05fd6ec..a1d667f 100644
--- a/chrome/browser/iframe_uitest.cc
+++ b/chrome/browser/iframe_uitest.cc
@@ -23,12 +23,7 @@ TEST_F(IFrameTest, Crash) {
NavigateAndVerifyTitle("iframe.html", L"iframe test");
}
-#if defined(OS_CHROMEOS)
-// Flakily crashes on ChromeOS: http://crbug.com/70192
-#define MAYBE_InEmptyFrame DISABLED_InEmptyFrame
-#else
-#define MAYBE_InEmptyFrame InEmptyFrame
-#endif
-TEST_F(IFrameTest, MAYBE_InEmptyFrame) {
+// Flakily crashes on all oses: http://crbug.com/70192
+TEST_F(IFrameTest, DISABLED_InEmptyFrame) {
NavigateAndVerifyTitle("iframe_in_empty_frame.html", L"iframe test");
}