diff options
| author | vabr@chromium.org <vabr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-05 17:38:50 +0000 |
|---|---|---|
| committer | vabr@chromium.org <vabr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-05 17:38:50 +0000 |
| commit | 7fbb534651b0c1827558198a6f8d898b659e5960 (patch) | |
| tree | cb9063a85543394df2b955150f74728288a74ec7 | |
| parent | 96d565712b1217b45385eda1b2e6f262bca6c98c (diff) | |
| download | chromium_src-7fbb534651b0c1827558198a6f8d898b659e5960.zip chromium_src-7fbb534651b0c1827558198a6f8d898b659e5960.tar.gz chromium_src-7fbb534651b0c1827558198a6f8d898b659e5960.tar.bz2 | |
Disabling AllUrlsApiTest.WhitelistedExtension
For Win Debug, it times out too often.
TBR=finnur@chromium.org
BUG=174341
Review URL: https://codereview.chromium.org/12223008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180719 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/all_urls_apitest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/extensions/all_urls_apitest.cc b/chrome/browser/extensions/all_urls_apitest.cc index 6294790..b72181c 100644 --- a/chrome/browser/extensions/all_urls_apitest.cc +++ b/chrome/browser/extensions/all_urls_apitest.cc @@ -16,7 +16,13 @@ const std::string kAllUrlsTarget = typedef ExtensionApiTest AllUrlsApiTest; -IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, WhitelistedExtension) { +#if defined(OS_WINDOWS) && !defined(NDEBUG) +// http://crbug.com/174341 +#define MAYBE_WhitelistedExtension DISABLED_WhitelistedExtension +#else +#define MAYBE_WhitelistedExtension WhitelistedExtension +#endif +IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, MAYBE_WhitelistedExtension) { // First setup the two extensions. FilePath extension_dir1 = test_data_dir_.AppendASCII("all_urls") .AppendASCII("content_script"); |