summaryrefslogtreecommitdiffstats
path: root/chrome/browser/iframe_uitest.cc
diff options
context:
space:
mode:
authoroshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-05 03:32:56 +0000
committeroshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-05 03:32:56 +0000
commit87167fbe34085242643e906681e8064b789985e2 (patch)
treef65b149e000dd9d3cc7225652c7d4b25b16cf1c8 /chrome/browser/iframe_uitest.cc
parent70a791c2e19ab55e1f4a48823c752d0bda6f25bf (diff)
downloadchromium_src-87167fbe34085242643e906681e8064b789985e2.zip
chromium_src-87167fbe34085242643e906681e8064b789985e2.tar.gz
chromium_src-87167fbe34085242643e906681e8064b789985e2.tar.bz2
Own text_view widget.
There seems to be the case where TextWidth() method is called after gtk widget hierarchy is destroyed, but before autocomplete_edit_view_gtk object is deleted. This ensures that text_view_ has same lifetime as the autocomplete object. BUG=70192 TEST=InEmptyFrame, PopupBlockedPostBlank should pass for linux builds. Review URL: http://codereview.chromium.org/6368104 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73902 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/iframe_uitest.cc')
-rw-r--r--chrome/browser/iframe_uitest.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/iframe_uitest.cc b/chrome/browser/iframe_uitest.cc
index a1d667f..c0740db 100644
--- a/chrome/browser/iframe_uitest.cc
+++ b/chrome/browser/iframe_uitest.cc
@@ -23,7 +23,12 @@ TEST_F(IFrameTest, Crash) {
NavigateAndVerifyTitle("iframe.html", L"iframe test");
}
-// Flakily crashes on all oses: http://crbug.com/70192
-TEST_F(IFrameTest, DISABLED_InEmptyFrame) {
+// Flakily crashes on non linux oses: http://crbug.com/70192
+#if defined(OS_LINUX)
+#define MAYBE_InEmptyFrame InEmptyFrame
+#else
+#define MAYBE_InEmptyFrame DISABLED_InEmptyFrame
+#endif
+TEST_F(IFrameTest, MAYBE_InEmptyFrame) {
NavigateAndVerifyTitle("iframe_in_empty_frame.html", L"iframe test");
}