summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/all_urls_apitest.cc
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-06 17:31:51 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-06 17:31:51 +0000
commit85fb807c92bcf07512d12bff47dd5a9e22c03161 (patch)
treed9ba51e66d5253cf9eb976b2257f3bd418804369 /chrome/browser/extensions/all_urls_apitest.cc
parent4dd5f9610d7faefb6514c5c346848a2809da9937 (diff)
downloadchromium_src-85fb807c92bcf07512d12bff47dd5a9e22c03161.zip
chromium_src-85fb807c92bcf07512d12bff47dd5a9e22c03161.tar.gz
chromium_src-85fb807c92bcf07512d12bff47dd5a9e22c03161.tar.bz2
Marking this test as flaky while I investigate.
I was hoping to finish this by EOD my time, but it is looking bleak. TBR=dhollowa BUG=57694 TEST=None git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61663 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/all_urls_apitest.cc')
-rw-r--r--chrome/browser/extensions/all_urls_apitest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/all_urls_apitest.cc b/chrome/browser/extensions/all_urls_apitest.cc
index 016d4f2..7de8eb4 100644
--- a/chrome/browser/extensions/all_urls_apitest.cc
+++ b/chrome/browser/extensions/all_urls_apitest.cc
@@ -15,7 +15,8 @@ const std::string kAllUrlsTarget =
typedef ExtensionApiTest AllUrlsApiTest;
-IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, WhitelistedExtension) {
+// Flaky, see http://crbug.com/57694.
+IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, FLAKY_WhitelistedExtension) {
// First load the two extension.
FilePath extension_dir1 = test_data_dir_.AppendASCII("all_urls")
.AppendASCII("content_script");
@@ -30,7 +31,6 @@ IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, WhitelistedExtension) {
Extension* extensionA = service->extensions()->at(size_before);
Extension* extensionB = service->extensions()->at(size_before + 1);
- // Then add the two extensions to the whitelist.
const char* kCanExecuteScriptsEverywhere[] = {
extensionA->id().c_str(),
extensionB->id().c_str(),