summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-16 16:03:23 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-16 16:03:23 +0000
commit10bf08b4d51096154f2e8823c70b6c2c2998f6a4 (patch)
treef754a375ef8713b68bb67569f5afc6c1b0645e28 /chrome_frame
parent337ca0791390f606472d7530abf7603ad2f24ca8 (diff)
downloadchromium_src-10bf08b4d51096154f2e8823c70b6c2c2998f6a4.zip
chromium_src-10bf08b4d51096154f2e8823c70b6c2c2998f6a4.tar.gz
chromium_src-10bf08b4d51096154f2e8823c70b6c2c2998f6a4.tar.bz2
Remove FLAKY_ from ChromeFrameActivex.ShouldShowVersionMismatchDialog
test. The errors we were seeing on the builders were transient, due to an IID change. I checked the last 5 runs of the 3 CF builders on the waterfall just now, and also earlier today, and the test passes on all of these runs. TEST=none BUG=62636 Review URL: http://codereview.chromium.org/5070001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/chrome_frame_activex_unittest.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome_frame/test/chrome_frame_activex_unittest.cc b/chrome_frame/test/chrome_frame_activex_unittest.cc
index 867e8dd..93f570f 100644
--- a/chrome_frame/test/chrome_frame_activex_unittest.cc
+++ b/chrome_frame/test/chrome_frame_activex_unittest.cc
@@ -52,8 +52,7 @@ class MockChromeFrameClientSite
}
};
-// http://code.google.com/p/chromium/issues/detail?id=62636
-TEST(ChromeFrameActivex, FLAKY_ShouldShowVersionMismatchDialog) {
+TEST(ChromeFrameActivex, ShouldShowVersionMismatchDialog) {
// If not privileged, we always show the dialog.
ASSERT_TRUE(
TestingChromeFrameActivex::TestingShouldShowVersionMismatchDialog(