Extensions: only inject the necessary extension API JSON into schema_generated_bindings.js when populating the chrome.* namespace, where "necessary" is defined as the APIs that the extension has permission to use.

BUG=80310
TEST=Extension* browser_tests

Review URL: http://codereview.chromium.org/8888024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115252 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 8 insertions, 23 deletions

diff --git a/chrome/test/data/extensions/api_test/context_menus/no_perms/test.js b/chrome/test/data/extensions/api_test/context_menus/no_perms/test.js
index ca9a60e..8b8ae22 100644
--- a/chrome/test/data/extensions/api_test/context_menus/no_perms/test.js
+++ b/chrome/test/data/extensions/api_test/context_menus/no_perms/test.js
@@ -1,20 +1,11 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 var tests = [
   function simple() {
-    try {
-      chrome.contextMenus.create({"title":"1"}, function() {
-      });
-    } catch (e) {
-      chrome.test.assertTrue(e.message.indexOf(
-          "You do not have permission to use 'contextMenus.create'") == 0);
-      chrome.test.succeed();
-      return;
-    }
-
-    chrome.test.fail("Should have gotten access error.");
+    chrome.test.assertEq(undefined, chrome.contextMenus);
+    chrome.test.succeed();
   }
 ];
 
diff --git a/chrome/test/data/extensions/api_test/cookies/no_permission/background.js b/chrome/test/data/extensions/api_test/cookies/no_permission/background.js
index c82de44..669e62b 100644
--- a/chrome/test/data/extensions/api_test/cookies/no_permission/background.js
+++ b/chrome/test/data/extensions/api_test/cookies/no_permission/background.js
@@ -4,16 +4,7 @@
 
 chrome.test.runTests([
   function readCookies() {
-    try {
-      chrome.cookies.get({url: document.location.href, name: 'a'}, function() {
-      });
-    } catch (e) {
-      chrome.test.assertTrue(e.message.indexOf(
-          "You do not have permission to use 'cookies.get'.") == 0);
-      chrome.test.succeed();
-      return;
-    }
-
-    chrome.test.fail();
+    chrome.test.assertEq(undefined, chrome.cookies);
+    chrome.test.succeed();
   }
 ]);
diff --git a/chrome/test/data/extensions/api_test/permissions/optional/background.js b/chrome/test/data/extensions/api_test/permissions/optional/background.js
index 2d70704..cf141c0 100644
--- a/chrome/test/data/extensions/api_test/permissions/optional/background.js
+++ b/chrome/test/data/extensions/api_test/permissions/optional/background.js
@@ -127,6 +127,9 @@ chrome.test.getConfig(function(config) {
     // We should be able to request the tabs API since it's in the granted
     // permissions list (see permissions_apitest.cc).
     function requestTabs() {
+      // chrome.windows is a optional permission, so the API definition should
+      // exist but its use disallowed.
+      assertTrue(!!chrome.windows);
       try {
         chrome.windows.getAll({populate: true}, function() {
           chrome.test.fail("Should not have tabs API permission.");