summaryrefslogtreecommitdiffstats
path: root/chrome/browser/popup_blocker_browsertest.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/popup_blocker_browsertest.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/popup_blocker_browsertest.cc')
-rw-r--r--chrome/browser/popup_blocker_browsertest.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/popup_blocker_browsertest.cc b/chrome/browser/popup_blocker_browsertest.cc
index f1662dd..1bcb4ea 100644
--- a/chrome/browser/popup_blocker_browsertest.cc
+++ b/chrome/browser/popup_blocker_browsertest.cc
@@ -23,13 +23,7 @@ static const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("popup_blocker");
typedef InProcessBrowserTest PopupBlockerBrowserTest;
-#if defined(OS_CHROMEOS)
-// Flakily crashes on ChromeOS: http://crbug.com/70192
-#define MAYBE_PopupBlockedPostBlank DISABLED_PopupBlockedPostBlank
-#else
-#define MAYBE_PopupBlockedPostBlank PopupBlockedPostBlank
-#endif
-IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, MAYBE_PopupBlockedPostBlank) {
+IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, PopupBlockedPostBlank) {
FilePath file_name(FILE_PATH_LITERAL("popup-blocked-to-post-blank.html"));
FilePath test_dir(kTestDir);
GURL url(ui_test_utils::GetTestUrl(test_dir, file_name));