diff options
| author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-26 18:22:31 +0000 |
|---|---|---|
| committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-26 18:22:31 +0000 |
| commit | 6621705e4040c002384afd6e07559b5d53d73b8b (patch) | |
| tree | d05232b7f2315a2c70cde8aab9da7ea6f9d19bf7 /chrome/browser/extensions/permissions_apitest.cc | |
| parent | e6022ca66a35f529dd4f206ba8c882401619c9b9 (diff) | |
| download | chromium_src-6621705e4040c002384afd6e07559b5d53d73b8b.zip chromium_src-6621705e4040c002384afd6e07559b5d53d73b8b.tar.gz chromium_src-6621705e4040c002384afd6e07559b5d53d73b8b.tar.bz2 | |
Revert revision 57540
TBR=cbiffle
BUG=45881
Review URL: http://codereview.chromium.org/3159046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57551 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/permissions_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/permissions_apitest.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/extensions/permissions_apitest.cc b/chrome/browser/extensions/permissions_apitest.cc index e872f77..628faa8 100644 --- a/chrome/browser/extensions/permissions_apitest.cc +++ b/chrome/browser/extensions/permissions_apitest.cc @@ -42,11 +42,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FavIconPermission) { ASSERT_TRUE(RunExtensionTest("permissions/favicon")) << message_; } -#if defined(OS_MACOSX) +// 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 +#if defined(OS_MACOSX) IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_NaClPermissionEnabled) { -#else -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, NaClPermissionEnabled) { -#endif ASSERT_TRUE(RunExtensionTest("permissions/nacl_enabled")) << message_; } +#endif |