summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authoryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-06 19:28:45 +0000
committeryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-06 19:28:45 +0000
commit2c09e75ecfaf7ee8ccea38a9ec3e78e7e8c3d045 (patch)
treee60e4cc380075121f3810365405adf41fd718ebd /chrome/renderer
parent9260b8f0d823ba65403bd4924bf07e7ab67b9250 (diff)
downloadchromium_src-2c09e75ecfaf7ee8ccea38a9ec3e78e7e8c3d045.zip
chromium_src-2c09e75ecfaf7ee8ccea38a9ec3e78e7e8c3d045.tar.gz
chromium_src-2c09e75ecfaf7ee8ccea38a9ec3e78e7e8c3d045.tar.bz2
Mark SearchProviderTest.TestIsSearchProviderInstalled as flaky on Win.
TBR=levin@chromium.org BUG=62777 TEST=none Review URL: http://codereview.chromium.org/7839005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99786 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/external_extension_uitest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/renderer/external_extension_uitest.cc b/chrome/renderer/external_extension_uitest.cc
index e948928..66a3fbd 100644
--- a/chrome/renderer/external_extension_uitest.cc
+++ b/chrome/renderer/external_extension_uitest.cc
@@ -128,7 +128,13 @@ void SearchProviderTest::FinishIsSearchProviderInstalledTest(
EXPECT_TRUE(data.tab->Close(true));
}
-TEST_F(SearchProviderTest, TestIsSearchProviderInstalled) {
+// Flaky on XP debug. http://crbug.com/62777
+#if defined(OS_WIN)
+#define MAYBE_TestIsSearchProviderInstalled FLAKY_TestIsSearchProviderInstalled
+#else
+#define MAYBE_TestIsSearchProviderInstalled TestIsSearchProviderInstalled
+#endif
+TEST_F(SearchProviderTest, MAYBE_TestIsSearchProviderInstalled) {
ASSERT_TRUE(test_server_started_);
// Use the default search provider, other installed search provider, and