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-08 23:55:52 +0000
committeroshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-08 23:55:52 +0000
commit9dfb3a1072ea2e304b6d5c4bf825e46a820a3667 (patch)
tree9afa52a95a58cb7ae63dfa89ee415a6e3d33ef95 /chrome/browser/iframe_uitest.cc
parent4978976710e30b759ccd7bf47e2eb2dce7a0a05b (diff)
downloadchromium_src-9dfb3a1072ea2e304b6d5c4bf825e46a820a3667.zip
chromium_src-9dfb3a1072ea2e304b6d5c4bf825e46a820a3667.tar.gz
chromium_src-9dfb3a1072ea2e304b6d5c4bf825e46a820a3667.tar.bz2
Use destroy signal to safe guard TextWidget method.
Looks like TextView related function stops working properly when TextView gets destroyed even if the object itself is not deleted. This CL address this case by using destroy signal explicitly. BUG=70192 TEST=FIFrameTest.InEmptyFrame should pass. Review URL: http://codereview.chromium.org/6413021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74203 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/iframe_uitest.cc')
-rw-r--r--chrome/browser/iframe_uitest.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/iframe_uitest.cc b/chrome/browser/iframe_uitest.cc
index fca703b..bc69358 100644
--- a/chrome/browser/iframe_uitest.cc
+++ b/chrome/browser/iframe_uitest.cc
@@ -23,12 +23,6 @@ TEST_F(IFrameTest, Crash) {
NavigateAndVerifyTitle("iframe.html", L"iframe test");
}
-#if defined(OS_LINUX)
-// Flakily crashes on linux: http://crbug.com/70192
-#define MAYBE_InEmptyFrame DISABLED_InEmptyFrame
-#else
-#define MAYBE_InEmptyFrame InEmptyFrame
-#endif
-TEST_F(IFrameTest, MAYBE_InEmptyFrame) {
+TEST_F(IFrameTest, InEmptyFrame) {
NavigateAndVerifyTitle("iframe_in_empty_frame.html", L"iframe test");
}