summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-10 10:31:31 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-10 10:31:31 +0000
commit92543b1c9f448f56d83d29ac23b60ae3bae0c739 (patch)
tree5068d7413fa0ada8b6a19210feeae4ae742db62b
parentebfd4b915548df519779cae0853fe34f31af36da (diff)
downloadchromium_src-92543b1c9f448f56d83d29ac23b60ae3bae0c739.zip
chromium_src-92543b1c9f448f56d83d29ac23b60ae3bae0c739.tar.gz
chromium_src-92543b1c9f448f56d83d29ac23b60ae3bae0c739.tar.bz2
Mark a test as flaky. My fix didn't work well enough.
BUG=57694 TEST=None Review URL: http://codereview.chromium.org/3652002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62113 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/all_urls_apitest.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/extensions/all_urls_apitest.cc b/chrome/browser/extensions/all_urls_apitest.cc
index ff82075..bfdaab4 100644
--- a/chrome/browser/extensions/all_urls_apitest.cc
+++ b/chrome/browser/extensions/all_urls_apitest.cc
@@ -15,6 +15,10 @@ const std::string kAllUrlsTarget =
typedef ExtensionApiTest AllUrlsApiTest;
+#if !defined(OS_WIN)
+#define WhitelistedExtension FLAKY_WhitelistedExtension
+#endif
+
IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, WhitelistedExtension) {
// First load the two extension.
FilePath extension_dir1 = test_data_dir_.AppendASCII("all_urls")