diff options
| author | sehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-01 04:02:42 +0000 |
|---|---|---|
| committer | sehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-01 04:02:42 +0000 |
| commit | 71dd5262b154c103fa48a813fd21dac3cf6b159a (patch) | |
| tree | c9b1bfac5ed2578713bd6c202726b6fbd4c454a1 /chrome/browser/extensions/permissions_apitest.cc | |
| parent | 49cd7e88053813e2e5e22f7fb87473342ab8c8b8 (diff) | |
| download | chromium_src-71dd5262b154c103fa48a813fd21dac3cf6b159a.zip chromium_src-71dd5262b154c103fa48a813fd21dac3cf6b159a.tar.gz chromium_src-71dd5262b154c103fa48a813fd21dac3cf6b159a.tar.bz2 | |
Remove the internal-nacl flag.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6250050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73252 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/permissions_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/permissions_apitest.cc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/chrome/browser/extensions/permissions_apitest.cc b/chrome/browser/extensions/permissions_apitest.cc index e1db706..33adfe2 100644 --- a/chrome/browser/extensions/permissions_apitest.cc +++ b/chrome/browser/extensions/permissions_apitest.cc @@ -47,18 +47,3 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FavIconPermission) { IN_PROC_BROWSER_TEST_F(ExtensionApiTest, AlwaysAllowed) { ASSERT_TRUE(RunExtensionTest("permissions/always_allowed")) << message_; } - -// TODO(gregoryd): run the NaCl test on all systems once -// http://code.google.com/p/chromium/issues/detail?id=51335 is fixed. -// Meanwhile we run it on Mac OSX only, since we can be sure that an x86-32 NaCl -// module will work there. -// Mark as Flaky. http://crbug.com/51861 -// -// FLAKY --> DISABLED since it takes 10sec to timeout a dialog. Need -// faster timeout. -#if defined(OS_MACOSX) -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_NaClPermissionEnabled) { - CommandLine::ForCurrentProcess()->AppendSwitch(switches::kInternalNaCl); - ASSERT_TRUE(RunExtensionTest("permissions/nacl_enabled")) << message_; -} -#endif |