Allow API functions and events to have entries in _api_features.json

chrome/test/data/extensions/api_test/stubs/content_script.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.
 
 // Helper function to log message to both the local console and to the
 // background page, so that the latter can output the message via the
 // chrome.test.log() function.
 function logToConsoleAndStdout(msg) {
   console.log(msg);
   chrome.extension.sendRequest("log: " + msg);
 }
 
 // We ask the background page to get the extension API to test against. When it
 // responds we start the test.
 console.log("asking for api ...");
 chrome.extension.sendRequest("getApi", function(apis) {
+  var apiFeatures = chrome.test.getApiFeatures();
+  function isAvailableToContentScripts(namespace, path) {
+    if (apiFeatures.hasOwnProperty(path))
+      return apiFeatures[path]['contexts'].indexOf('content_script') != -1
+    return apiFeatures.hasOwnProperty(namespace) &&
+        apiFeatures[namespace]['contexts'].indexOf('content_script') != -1;
+  }
+
   console.log("got api response");
   var privilegedPaths = [];
   var unprivilegedPaths = [];
   apis.forEach(function(module) {
     var namespace = module.namespace;
 
     ["functions", "events"].forEach(function(section) {
       if (typeof(module[section]) == "undefined")
         return;
       module[section].forEach(function(entry) {
         // Ignore entries that are not applicable to the manifest that we're
         // running under.
         if (entry.maximumManifestVersion && entry.maximumManifestVersion < 2) {
           return;
         }
 
         var path = namespace + "." + entry.name;
-        // TODO(cduvall): Make this inspect _api_features.json.
-        // http://crbug.com/232247
-        // Manually add chrome.app to the unprivileged APIs since it uses the
-        // feature system now.
-        if (module.unprivileged || entry.unprivileged || namespace == 'app') {
+        if (module.unprivileged || entry.unprivileged ||
+            isAvailableToContentScripts(namespace, path)) {
           unprivilegedPaths.push(path);
         } else {
           privilegedPaths.push(path);
         }
       });
     });
 
     if (module.properties) {
       for (var propName in module.properties) {
         var path = namespace + "." + propName;
-        if (module.unprivileged || module.properties[propName].unprivileged) {
+        if (module.unprivileged || module.properties[propName].unprivileged ||
+            isAvailableToContentScripts(namespace, path)) {
           unprivilegedPaths.push(path);
         } else {
           privilegedPaths.push(path);
         }
       }
     }
   });
   doTest(privilegedPaths, unprivilegedPaths);
 });
 
@@ skipping 17 matching lines @@
         return false;
       }
       if (typeof(module) == "undefined")
         return true;
     } else {
       // This is the last component - we expect it to either be undefined or
       // to throw an error on access.
       try {
         if (typeof(module[parts[i]]) == "undefined" &&
             path != "extension.lastError" &&
-            path != "runtime.lastError" &&
-            path != "runtime.id") {
-          logToConsoleAndStdout(" fail (undefined and not throwing error): " +
-                                path);
-          return false;
+            path != "runtime.lastError") {
+          if (expectError) {
+            return true;
+          } else {
+            logToConsoleAndStdout(" fail (should not be undefined): " + path);
+            return false;
+          }
         } else if (!expectError) {
           return true;
         }
       } catch (err) {
         if (!expectError) {
           logToConsoleAndStdout(" fail (did not expect error): " + path);
           return false;
         }
         var str = err.toString();
         if (str.search("can only be used in extension processes.") != -1) {
@@ skipping 59 matching lines @@
   console.log(success ? "pass" : "fail");
   if (success) {
     reportSuccess();
   } else {
     logToConsoleAndStdout("failures on:\n" + failures.join("\n") +
         "\n\n\n>>> See comment in stubs_apitest.cc for a " +
         "hint about fixing this failure.\n\n");
     reportFailure();
   }
 }