Convert app_bindings.js to the schema_generated_bindings.js infrastructure.

chrome/renderer/extensions/schema_generated_bindings.cc

 // 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.
 
 #include "chrome/renderer/extensions/schema_generated_bindings.h"
 
 #include <map>
 #include <set>
 #include <string>
 
@@ skipping 36 matching lines @@
 using content::V8ValueConverter;
 using extensions::ExtensionAPI;
 using WebKit::WebFrame;
 using WebKit::WebSecurityOrigin;
 
 namespace {
 
 const char* kExtensionDeps[] = {
   "extensions/event.js",
   "extensions/json_schema.js",
-  "extensions/miscellaneous_bindings.js",
-  "extensions/apitest.js"
 };
 
 // Contains info relevant to a pending API request.
 struct PendingRequest {
  public :
   PendingRequest(v8::Persistent<v8::Context> context, const std::string& name,
                  const std::string& extension_id)
       : context(context), name(name), extension_id(extension_id) {
   }
   v8::Persistent<v8::Context> context;
@@ skipping 66 matching lines @@
   }
 
   static v8::Handle<v8::Value> GetExtensionAPIDefinition(
       const v8::Arguments& args) {
     ExtensionImpl* self = GetFromArguments<ExtensionImpl>(args);
     ExtensionDispatcher* dispatcher = self->extension_dispatcher_;
 
     ChromeV8Context* v8_context = dispatcher->v8_context_set().GetCurrent();
     CHECK(v8_context);
 
+    ExtensionAPI::SchemaMap schemas;
+
     std::string extension_id = v8_context->extension_id();
-    ExtensionAPI::SchemaMap schemas;
-    ExtensionAPI::GetSchemasFilter filter =
-        dispatcher->is_extension_process() ?
-            ExtensionAPI::ALL : ExtensionAPI::ONLY_UNPRIVILEGED;
+    // An Extension may not be found, but CHECK that as required.
+    const ::Extension* extension =
+        dispatcher->extensions()->GetByID(extension_id);
 
     if (dispatcher->IsTestExtensionId(extension_id)) {
-      ExtensionAPI::GetInstance()->GetDefaultSchemas(filter, &schemas);
+      ExtensionAPI::GetInstance()->GetDefaultSchemas(
+          ExtensionAPI::ONLY_UNPRIVILEGED, &schemas);
     } else {
-      const ::Extension* extension =
-          dispatcher->extensions()->GetByID(extension_id);
-      CHECK(extension) << extension_id << " not found";
-      ExtensionAPI::GetInstance()->GetSchemasForExtension(
-          *extension, filter, &schemas);
+      switch (v8_context->context_type()) {
+        case ChromeV8Context::PRIVILEGED:
+          CHECK(extension) << extension_id << " not found";
+          ExtensionAPI::GetInstance()->GetSchemasForExtension(

[Aaron Boodman, 2012/02/29 01:03:58]

Is it possible to consolidate this knowledge into ExtensionAPI?

ExtensionAPI::GetSchemasForContext(ContextType, Extension*, GURL)

Also, it seems like it would simplify things to add the new context type
"web_page" (or maybe "other_web_page") to the api.json. So the app declaration
would be:

other_web_page=true, matches=["<all_urls>"]

That way the implementation of GetSchemasForContext could just check each
requirement of the schema node against what was passed in, and not have a
special case for WEB_PAGE.

[not at google - send to devlin, 2012/03/05 07:46:54]

Done. This is much nicer (I actually made it just GetAvailableAPIs which returns
a set -- much simpler).
I'm not sure if that does simplify it. Hmm. Well, actually, once the Features
work for ExtensionAPI is done I think that for consistency it would probably
make sense to have this in the availableTo thing. I don't think it does right
now, though... the presence of a "matches" property implies web_page, but what
would the presence of web_page without matches imply?

Perhaps I'm remembering / looking at this the wrong way.

+              *extension, ExtensionAPI::ALL, &schemas);
+          break;
+
+        case ChromeV8Context::CONTENT_SCRIPT:
+        case ChromeV8Context::UNPRIVILEGED:
+          CHECK(extension) << extension_id << " not found";
+          ExtensionAPI::GetInstance()->GetSchemasForExtension(
+              *extension, ExtensionAPI::ONLY_UNPRIVILEGED, &schemas);
+          break;
+
+        case ChromeV8Context::WEB_PAGE:
+          ExtensionAPI::GetInstance()->GetSchemasForURL(
+              UserScriptSlave::GetDataSourceURLForFrame(
+                  v8_context->web_frame()),
+              &schemas);
+          break;
+      }
     }
 
     v8::Persistent<v8::Context> context(v8::Context::New());
     v8::Context::Scope context_scope(context);
     v8::Handle<v8::Array> api(v8::Array::New(schemas.size()));
     size_t api_index = 0;
     for (ExtensionAPI::SchemaMap::iterator it = schemas.begin();
         it != schemas.end(); ++it) {
-      std::string api_name = it->first;
-      api->Set(api_index, GetV8SchemaForAPI(self, context, api_name));
+      api->Set(api_index, GetV8SchemaForAPI(self, context, it->first));
       ++api_index;
     }
 
     // The persistent extension_api_ will keep the context alive.
     context.Dispose();
 
     return api;
   }
 
   static v8::Handle<v8::Value> GetNextRequestId(const v8::Arguments& args) {
@@ skipping 232 matching lines @@
     const std::string& extension_id) {
   for (PendingRequestMap::const_iterator it = g_pending_requests.Get().begin();
        it != g_pending_requests.Get().end(); ++it) {
     if (it->second->extension_id == extension_id)
       return true;
   }
   return false;
 }
 
 }  // namespace