From 2d78334cabcfac4c528bb7f737fcafa4067ed2e8 Mon Sep 17 00:00:00 2001 From: "gregoryd@google.com" Date: Wed, 11 Aug 2010 20:48:28 +0000 Subject: Add a test for "native_client" permission for extensions. BUG=45881 TEST=this CL Review URL: http://codereview.chromium.org/3064048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55775 0039d316-1c4b-4281-b951-d872f2087c98 --- DEPS | 3 ++ chrome/browser/extensions/permissions_apitest.cc | 10 ++++++ .../permissions/nacl_enabled/background.html | 42 ++++++++++++++++++++++ .../permissions/nacl_enabled/manifest.json | 7 ++++ 4 files changed, 62 insertions(+) create mode 100644 chrome/test/data/extensions/api_test/permissions/nacl_enabled/background.html create mode 100644 chrome/test/data/extensions/api_test/permissions/nacl_enabled/manifest.json diff --git a/DEPS b/DEPS index bf3d0fd..ee521c3 100644 --- a/DEPS +++ b/DEPS @@ -57,6 +57,9 @@ deps = { "src/native_client": "http://nativeclient.googlecode.com/svn/trunk/src/native_client@" + Var("nacl_revision"), + "src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin": + "http://nativeclient.googlecode.com/svn/trunk/src/native_client/tests/prebuilt@" + + Var("nacl_revision"), "src/third_party/skia/src": "http://skia.googlecode.com/svn/trunk/src@" + Var("skia_revision"), diff --git a/chrome/browser/extensions/permissions_apitest.cc b/chrome/browser/extensions/permissions_apitest.cc index 82c4068..b86940a 100644 --- a/chrome/browser/extensions/permissions_apitest.cc +++ b/chrome/browser/extensions/permissions_apitest.cc @@ -41,3 +41,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ExperimentalPermissionsFail) { IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FavIconPermission) { ASSERT_TRUE(RunExtensionTest("permissions/favicon")) << 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. +#if defined(OS_MACOSX) +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, NaClPermissionEnabled) { + ASSERT_TRUE(RunExtensionTest("permissions/nacl_enabled")) << message_; +} +#endif diff --git a/chrome/test/data/extensions/api_test/permissions/nacl_enabled/background.html b/chrome/test/data/extensions/api_test/permissions/nacl_enabled/background.html new file mode 100644 index 0000000..a813fe8 --- /dev/null +++ b/chrome/test/data/extensions/api_test/permissions/nacl_enabled/background.html @@ -0,0 +1,42 @@ + + +

Native Client SRPC Simple Plug-in

+

+ +

diff --git a/chrome/test/data/extensions/api_test/permissions/nacl_enabled/manifest.json b/chrome/test/data/extensions/api_test/permissions/nacl_enabled/manifest.json new file mode 100644 index 0000000..c37d815 --- /dev/null +++ b/chrome/test/data/extensions/api_test/permissions/nacl_enabled/manifest.json @@ -0,0 +1,7 @@ +{ + "name": "nacl permission enabled apitest", + "description": "nacl permission enabled extension", + "version": "0.1", + "background_page": "background.html", + "permissions": [ "native_client" ] +} -- cgit v1.1