diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-06 09:01:01 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-06 09:01:01 +0000 |
| commit | 35d8285d85af9ee94e885a98cdb4cfd082cd6363 (patch) | |
| tree | f888d4757f745d778b74e19f476f1158d7abad19 /chrome/browser/external_extension_browsertest.cc | |
| parent | 58d543589504d18ceaaea5b41075027873c6dd5f (diff) | |
| download | chromium_src-35d8285d85af9ee94e885a98cdb4cfd082cd6363.zip chromium_src-35d8285d85af9ee94e885a98cdb4cfd082cd6363.tar.gz chromium_src-35d8285d85af9ee94e885a98cdb4cfd082cd6363.tar.bz2 | |
Disable SearchProviderTest.TestIsSearchProviderInstalled on XP, it is timing out
BUG=159530
Review URL: https://chromiumcodereview.appspot.com/11362105
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166177 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/external_extension_browsertest.cc')
| -rw-r--r-- | chrome/browser/external_extension_browsertest.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/external_extension_browsertest.cc b/chrome/browser/external_extension_browsertest.cc index b356427..c57b42f 100644 --- a/chrome/browser/external_extension_browsertest.cc +++ b/chrome/browser/external_extension_browsertest.cc @@ -82,8 +82,15 @@ class SearchProviderTest : public InProcessBrowserTest { DISALLOW_COPY_AND_ASSIGN(SearchProviderTest); }; -// If this flakes on Windows, use http://crbug.com/62777 -IN_PROC_BROWSER_TEST_F(SearchProviderTest, TestIsSearchProviderInstalled) { +#if defined(OS_WIN) +// This is flaking on XP. See http://crbug.com/159530 +#define MAYBE_TestIsSearchProviderInstalled \ + DISABLED_TestIsSearchProviderInstalled +#else +#define MAYBE_TestIsSearchProviderInstalled TestIsSearchProviderInstalled +#endif +IN_PROC_BROWSER_TEST_F(SearchProviderTest, + MAYBE_TestIsSearchProviderInstalled) { // Use the default search provider, other installed search provider, and // one not installed as well. (Note that yahoo isn't tested because the // its host name varies a lot for different locales unlike Google and Bing, |