diff options
| author | twiz@google.com <twiz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-27 18:07:22 +0000 |
|---|---|---|
| committer | twiz@google.com <twiz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-27 18:07:22 +0000 |
| commit | 90d5bb5672e73d8ab929b360f074e975e94815b0 (patch) | |
| tree | 578c6216ac6cdfefb776568d6a3c9cc2fd644ebc | |
| parent | 5276adda50be7242b4b8bf6bf08a5643a5706014 (diff) | |
| download | chromium_src-90d5bb5672e73d8ab929b360f074e975e94815b0.zip chromium_src-90d5bb5672e73d8ab929b360f074e975e94815b0.tar.gz chromium_src-90d5bb5672e73d8ab929b360f074e975e94815b0.tar.bz2 | |
Correction of permissions of extension manifest file for the extension_popup_apitest.cc unit test.
I also removed the flaky designator from this test, as I was able to run the test (under stress conditions of 10 concurrent instances) without failure.
BUG=27271
TEST=extension_popup_apitest.cc (ExtensionApiTest.Popup)
Review URL: http://codereview.chromium.org/548157
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37266 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/extension_popup_apitest.cc | 3 | ||||
| -rw-r--r-- | chrome/test/data/extensions/api_test/popup/manifest.json | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_popup_apitest.cc b/chrome/browser/extensions/extension_popup_apitest.cc index 0ed45c3..c445325 100644 --- a/chrome/browser/extensions/extension_popup_apitest.cc +++ b/chrome/browser/extensions/extension_popup_apitest.cc @@ -6,8 +6,7 @@ #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/common/chrome_switches.h" -// Flaky, http://crbug.com/27271. -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_Popup) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Popup) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); CommandLine::ForCurrentProcess()->AppendSwitch( diff --git a/chrome/test/data/extensions/api_test/popup/manifest.json b/chrome/test/data/extensions/api_test/popup/manifest.json index 01c2cee..4f950ff 100644 --- a/chrome/test/data/extensions/api_test/popup/manifest.json +++ b/chrome/test/data/extensions/api_test/popup/manifest.json @@ -4,5 +4,6 @@ "description": "apitest for the popup api", "toolstrips": [ "toolband.html" - ] + ], + "permissions": ["experimental"] } |