Remove dependence on .json files for IDL-specified extensions/apps APIs

chrome/common/extensions/api/extension_api.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/common/extensions/api/extension_api.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/values.h"
+#include "chrome/common/extensions/api/generated_schemas.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_permission_set.h"
 #include "grit/common_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace extensions {
 
 namespace {
 
 // Adds any APIs listed in "dependencies" found in |schema| but not in
@@ skipping 48 matching lines @@
               resource_id).as_string(),
           kAllowTrailingCommas,
           NULL,  // error code
           &error_message);
   CHECK(result) << error_message;
   CHECK(result->IsType(base::Value::TYPE_LIST));
   return static_cast<base::ListValue*>(result);
 }
 
 void ExtensionAPI::LoadSchemaFromResource(int resource_id) {
-  scoped_ptr<base::ListValue> loaded(LoadSchemaList(resource_id));
+  RegisterSchema(LoadSchemaList(resource_id));
+}
+
+void ExtensionAPI::RegisterSchema(base::ListValue* loaded_schema) {
+  // We take ownership of loaded_schema, so we need to delete it.
+  scoped_ptr<base::ListValue> scoped_loaded_schema(loaded_schema);
   Value* value = NULL;
   std::string schema_namespace;
-  while (!loaded->empty()) {
-    loaded->Remove(loaded->GetSize() - 1, &value);
+  while (!loaded_schema->empty()) {
+    loaded_schema->Remove(loaded_schema->GetSize() - 1, &value);
     CHECK(value->IsType(Value::TYPE_DICTIONARY));
     const DictionaryValue* schema = static_cast<const DictionaryValue*>(value);
     CHECK(schema->GetString("namespace", &schema_namespace));
     schemas_[schema_namespace] = linked_ptr<const DictionaryValue>(schema);
   }
 }
 
 ExtensionAPI::ExtensionAPI() {
   static int kJsonApiResourceIds[] = {
     IDR_EXTENSION_API_JSON_BOOKMARKS,
     IDR_EXTENSION_API_JSON_BROWSERACTION,
     IDR_EXTENSION_API_JSON_BROWSING_DATA,
     IDR_EXTENSION_API_JSON_CHROMEAUTHPRIVATE,
     IDR_EXTENSION_API_JSON_CHROMEOSINFOPRIVATE,
     IDR_EXTENSION_API_JSON_CHROMEPRIVATE,
     IDR_EXTENSION_API_JSON_CONTENTSETTINGS,
     IDR_EXTENSION_API_JSON_CONTEXTMENUS,
     IDR_EXTENSION_API_JSON_COOKIES,
     IDR_EXTENSION_API_JSON_DEBUGGER,
     IDR_EXTENSION_API_JSON_DEVTOOLS,
     IDR_EXTENSION_API_JSON_EXPERIMENTAL_ACCESSIBILITY,
     IDR_EXTENSION_API_JSON_EXPERIMENTAL_APP,
     IDR_EXTENSION_API_JSON_EXPERIMENTAL_BOOKMARKMANAGER,
     IDR_EXTENSION_API_JSON_EXPERIMENTAL_DECLARATIVE,
-    IDR_EXTENSION_API_JSON_EXPERIMENTAL_DNS,

[miket_OOO, 2012/03/20 21:52:16]

Thanks (etc.)

     IDR_EXTENSION_API_JSON_EXPERIMENTAL_DOWNLOADS,
     IDR_EXTENSION_API_JSON_EXPERIMENTAL_EXTENSIONS,
     IDR_EXTENSION_API_JSON_EXPERIMENTAL_FONTS,
     IDR_EXTENSION_API_JSON_EXPERIMENTAL_INFOBARS,
     IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_UI,
     IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_VIRTUALKEYBOARD,
     IDR_EXTENSION_API_JSON_EXPERIMENTAL_KEYBINDING,
     IDR_EXTENSION_API_JSON_EXPERIMENTAL_MANAGED_MODE,
     IDR_EXTENSION_API_JSON_EXPERIMENTAL_PROCESSES,
     IDR_EXTENSION_API_JSON_EXPERIMENTAL_RLZ,
@@ skipping 31 matching lines @@
     IDR_EXTENSION_API_JSON_WEBNAVIGATION,
     IDR_EXTENSION_API_JSON_WEBREQUEST,
     IDR_EXTENSION_API_JSON_WEBSOCKETPROXYPRIVATE,
     IDR_EXTENSION_API_JSON_WEBSTOREPRIVATE,
     IDR_EXTENSION_API_JSON_WINDOWS,
   };
 
   for (size_t i = 0; i < arraysize(kJsonApiResourceIds); i++) {
     LoadSchemaFromResource(kJsonApiResourceIds[i]);
   }
+  RegisterSchema(api::GeneratedSchemas::Get());
 
   // Populate {completely,partially}_unprivileged_apis_.
   for (SchemaMap::iterator it = schemas_.begin(); it != schemas_.end(); ++it) {
     bool unprivileged = false;
     it->second->GetBoolean("unprivileged", &unprivileged);
     if (unprivileged) {
       completely_unprivileged_apis_.insert(it->first);
       continue;
     }
 
@@ skipping 132 matching lines @@
       (*out)[it->first] = it->second;
   }
 }
 
 bool ExtensionAPI::IsWholeAPIPrivileged(const std::string& api_name) const {
   return !completely_unprivileged_apis_.count(api_name) &&
          !partially_unprivileged_apis_.count(api_name);
 }
 
 }  // namespace extensions