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 75 matching lines @@
 
     std::string extension_id = v8_context->extension_id();
     ExtensionAPI::SchemaMap schemas;
     ExtensionAPI::GetSchemasFilter filter =
         dispatcher->is_extension_process() ?
             ExtensionAPI::ALL : ExtensionAPI::ONLY_UNPRIVILEGED;
 
     if (dispatcher->IsTestExtensionId(extension_id)) {
       ExtensionAPI::GetInstance()->GetDefaultSchemas(filter, &schemas);
     } else {
-      const ::Extension* extension =
+      // UNPRIVILEGED context_type refers to the v8 context this request is
+      // from (as opposed to an extension or content script context), and isn't
+      // related to "unprivileged" in the extension API sense. This distinction
+      // will be sanitized soon, when ExtensionAPI uses Features.
+      if (v8_context->context_type() == ChromeV8Context::UNPRIVILEGED) {
+        GURL frame_url =
+            UserScriptSlave::GetDataSourceURLForFrame(v8_context->web_frame());
+        ExtensionAPI::GetInstance()->GetSchemasForURL(frame_url, &schemas);
+      } else {
+        const ::Extension* extension =
           dispatcher->extensions()->GetByID(extension_id);
-      CHECK(extension) << extension_id << " not found";
-      ExtensionAPI::GetInstance()->GetSchemasForExtension(
-          *extension, filter, &schemas);
+        CHECK(extension) << extension_id << " not found";
+        ExtensionAPI::GetInstance()->GetSchemasForExtension(
+            *extension, filter, &schemas);
+      }
     }
 
     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