summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-11 15:52:59 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-11 15:52:59 +0000
commit0de17413dd30ddcc5c5c9a18953ee9b3e3d4447b (patch)
tree3108b5966006a5e12a65c1be8972fb9360eaddd7 /chrome_frame
parentbf37b1d8ba2b7308b2b356112e614f0dbe195dd0 (diff)
downloadchromium_src-0de17413dd30ddcc5c5c9a18953ee9b3e3d4447b.zip
chromium_src-0de17413dd30ddcc5c5c9a18953ee9b3e3d4447b.tar.gz
chromium_src-0de17413dd30ddcc5c5c9a18953ee9b3e3d4447b.tar.bz2
Mark FLAKY_ rather than DISABLED_ so I can debug the test on the Chrome
Frame build bots, without turning them red. BUG=62636 TEST=none Review URL: http://codereview.chromium.org/4691006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65804 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/chrome_frame_activex_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/test/chrome_frame_activex_unittest.cc b/chrome_frame/test/chrome_frame_activex_unittest.cc
index 06c5a4d..867e8dd 100644
--- a/chrome_frame/test/chrome_frame_activex_unittest.cc
+++ b/chrome_frame/test/chrome_frame_activex_unittest.cc
@@ -53,7 +53,7 @@ class MockChromeFrameClientSite
};
// http://code.google.com/p/chromium/issues/detail?id=62636
-TEST(ChromeFrameActivex, DISABLED_ShouldShowVersionMismatchDialog) {
+TEST(ChromeFrameActivex, FLAKY_ShouldShowVersionMismatchDialog) {
// If not privileged, we always show the dialog.
ASSERT_TRUE(
TestingChromeFrameActivex::TestingShouldShowVersionMismatchDialog(