summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/iframe_uitest.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/iframe_uitest.cc b/chrome/browser/iframe_uitest.cc
index 2f3a7f7..347610c 100644
--- a/chrome/browser/iframe_uitest.cc
+++ b/chrome/browser/iframe_uitest.cc
@@ -6,6 +6,7 @@
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/platform_thread.h"
+#include "build/build_config.h"
#include "chrome/test/ui/ui_test.h"
#include "net/base/net_util.h"
@@ -31,6 +32,10 @@ TEST_F(IFrameTest, Crash) {
NavigateAndVerifyTitle("iframe.html", L"iframe test");
}
+#if !defined(OS_LINUX)
+// Temporarily disabled on Linux -- see bug 9870.
+// http://code.google.com/p/chromium/issues/detail?id=9870
TEST_F(IFrameTest, InEmptyFrame) {
NavigateAndVerifyTitle("iframe_in_empty_frame.html", L"iframe test");
}
+#endif