diff options
| author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-25 21:07:22 +0000 |
|---|---|---|
| committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-25 21:07:22 +0000 |
| commit | c9e5e22852fea0437110083579f65cef221b2cdc (patch) | |
| tree | 762db390492f001003a4126c16f3804f7197b8b3 /ceee | |
| parent | d4c81a25ce08c5bfeb464dc1bc4c95087f1c2075 (diff) | |
| download | chromium_src-c9e5e22852fea0437110083579f65cef221b2cdc.zip chromium_src-c9e5e22852fea0437110083579f65cef221b2cdc.tar.gz chromium_src-c9e5e22852fea0437110083579f65cef221b2cdc.tar.bz2 | |
Fixed flaky test.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/5357005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ceee')
| -rw-r--r-- | ceee/ie/plugin/bho/mediumtest_browser_event.cc | 3 | ||||
| -rw-r--r-- | ceee/ie/testing/mediumtest_ie_common.cc | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/ceee/ie/plugin/bho/mediumtest_browser_event.cc b/ceee/ie/plugin/bho/mediumtest_browser_event.cc index 9a335fa..3288e9d 100644 --- a/ceee/ie/plugin/bho/mediumtest_browser_event.cc +++ b/ceee/ie/plugin/bho/mediumtest_browser_event.cc @@ -465,8 +465,7 @@ TEST_F(BrowserEventTest, NavigateToDifferentPageRetainsEventHandler) { EXPECT_EQ(3, TestFrameEventHandler::instance_count()); } -// The failure may be IE9-specific. -TEST_F(BrowserEventTest, FLAKY_RefreshFrameBrowserRetainsHandler) { +TEST_F(BrowserEventTest, RefreshFrameBrowserRetainsHandler) { EXPECT_TRUE(NavigateBrowser(GetTestUrl(kTwoFramesPage))); // We should have three frame handlers at this point. diff --git a/ceee/ie/testing/mediumtest_ie_common.cc b/ceee/ie/testing/mediumtest_ie_common.cc index 1b2fd45..f208808 100644 --- a/ceee/ie/testing/mediumtest_ie_common.cc +++ b/ceee/ie/testing/mediumtest_ie_common.cc @@ -173,15 +173,15 @@ void ShellBrowserTestBase::TearDown() { host_.Release(); browser_.Release(); + // Finally blow away the host window. + if (IsWindow()) + DestroyWindow(); + // Should have retained no objects past this point. EXPECT_EQ(0, InstanceCountMixinBase::all_instance_count()); if (InstanceCountMixinBase::all_instance_count() > 0) { InstanceCountMixinBase::LogLeakedInstances(); } - - // Finally blow away the host window. - if (IsWindow()) - DestroyWindow(); } bool ShellBrowserTestBase::NavigateBrowser(const std::wstring& url) { |