Lazily load API schemas from resource files and convert all APIs to features

chrome/test/data/extensions/api_test/permissions/optional/background.js

 // Copyright (c) 2012 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 assertEq = chrome.test.assertEq;
 var assertFalse = chrome.test.assertFalse;
 var assertTrue = chrome.test.assertTrue;
 var fail = chrome.test.callbackFail;
 var pass = chrome.test.callbackPass;
 var listenOnce = chrome.test.listenOnce;
 
 var NOT_OPTIONAL_ERROR =
     "Optional permissions must be listed in extension manifest.";
 
-var NO_BOOKMARKS_PERMISSION =
-    "You do not have permission to use 'bookmarks.getTree'.";
-
 var REQUIRED_ERROR =
     "You cannot remove required permissions.";
 
 var NOT_WHITE_LISTED_ERROR =
     "The optional permissions API does not support '*'.";
 
 var UNKNOWN_PERMISSIONS_ERROR =
     "'*' is not a recognized permission.";
 
 var emptyPermissions = {permissions: [], origins: []};
@@ skipping 95 matching lines @@
           {permissions: ['history'], origins: ['http://*.b.com/*']},
           fail(NOT_OPTIONAL_ERROR));
     },
 
     // We should be able to request the bookmarks API since it's in the granted
     // permissions list (see permissions_apitest.cc).
     function requestBookmarks() {
       // chrome.bookmarks is a optional permission, so the API definition should
       // exist but its use disallowed.
       assertTrue(!!chrome.bookmarks);
-      try {
-        chrome.bookmarks.getTree(function() {
-          chrome.test.fail("Should not have bookmarks API permission.");
-        });
-      } catch (e) {
-        assertTrue(e.message.indexOf(NO_BOOKMARKS_PERMISSION) == 0);
-      }
+      assertTrue(chrome.runtime.lastError === undefined);
+      chrome.bookmarks.getTree(function() {
+        assertFalse(chrome.runtime.lastError === undefined);

[not at google - send to devlin, 2013/05/30 16:38:52]

What fails? You should use chrome.test.callbackFail with the expected error
message.

Same everywhere else in this file.

though this assumption will change with the reload permission stuff. maybe I'll
try and do that today myself. I'll let you know.

[cduvall, 2013/06/12 01:22:19]

Fixed in optional permission reload.

+      });
+
       listenOnce(chrome.permissions.onAdded,
                  function(permissions) {
         assertTrue(permissions.permissions.length == 1);
         assertTrue(permissions.permissions[0] == 'bookmarks');
       });
       chrome.permissions.request(
           {permissions:['bookmarks']},
           pass(function(granted) {
             assertTrue(granted);
             chrome.bookmarks.getTree(pass(function(result) {
@@ skipping 48 matching lines @@
                  function(permissions) {
         assertTrue(permissions.permissions.length == 1);
         assertTrue(permissions.permissions[0] == 'bookmarks');
       });
       chrome.permissions.remove(
           {permissions:['bookmarks']},
           pass(function() {
             chrome.permissions.getAll(pass(function(permissions) {
               assertTrue(checkPermSetsEq(initialPermissions, permissions));
             }));
-            try {
-              chrome.bookmarks.getTree(function() {
-                chrome.test.fail("Should not have bookmarks API permission.");
-              });
-            } catch (e) {
-              assertTrue(e.message.indexOf(NO_BOOKMARKS_PERMISSION) == 0);
-            }
+
+            assertTrue(chrome.runtime.lastError === undefined);
+            chrome.bookmarks.getTree(function() {
+              assertFalse(chrome.runtime.lastError === undefined);
+            });
       }));
     },
 
     // The user shouldn't have to approve permissions that have no warnings.
     function noPromptForNoWarnings() {
       chrome.permissions.request(
           {permissions: ['notifications']},
           pass(function(granted) {
         assertTrue(granted);
 
@@ skipping 73 matching lines @@
     // onAdded and onRemoved event listeners.
     function eventListenerPermissions() {
       listenOnce(chrome.permissions.onAdded,
                  function(permissions) {
         chrome.bookmarks.getTree(pass(function() {
           assertTrue(true);
         }));
       });
       listenOnce(chrome.permissions.onRemoved,
                  function(permissions) {
-        try {
-          chrome.bookmarks.getTree(function() {
-            chrome.test.fail("Should not have bookmakrs API permission.");
-          });
-        } catch (e) {
-          assertTrue(e.message.indexOf(NO_BOOKMARKS_PERMISSION) == 0);
-        }
+        assertTrue(chrome.runtime.lastError === undefined);
+        chrome.bookmarks.getTree(function() {
+          assertFalse(chrome.runtime.lastError === undefined);
+        });
       });
 
       chrome.permissions.request(
           {permissions: ['bookmarks', 'management']}, pass(function(granted) {
         assertTrue(granted);
         chrome.permissions.remove(
             {permissions: ['bookmarks']}, pass(function() {
           assertTrue(true);
         }));
       }));
     }
 
   ]);
 });