Move the "extension" namespace from extension_api.json into extension_api_extension.json.

chrome/common/extensions/api/extension_api.cc

 // Copyright (c) 2011 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 <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 "grit/common_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace extensions {
 
 // static
 ExtensionAPI* ExtensionAPI::GetInstance() {
   return Singleton<ExtensionAPI>::get();
 }
 
-ExtensionAPI::ExtensionAPI() {
+static base::ListValue* LoadSchemaList(int resource_id) {
   const bool kAllowTrailingCommas = false;
   std::string error_message;
-  scoped_ptr<Value> temp_value(
+  Value* result =
       base::JSONReader::ReadAndReturnError(
           ResourceBundle::GetSharedInstance().GetRawDataResource(
-              IDR_EXTENSION_API_JSON).as_string(),
+              resource_id).as_string(),
           kAllowTrailingCommas,
           NULL,  // error code
-          &error_message));
-  CHECK(temp_value.get()) << error_message;
-  CHECK(temp_value->IsType(base::Value::TYPE_LIST))
-      << "Top-level node in extension API is not dictionary";
+          &error_message);
+  CHECK(result) << error_message;
+  CHECK(result->IsType(base::Value::TYPE_LIST));
+  return static_cast<base::ListValue*>(result);
+}
 
-  value_.reset(static_cast<base::ListValue*>(temp_value.release()));
+static void AppendExtraSchemaList(base::ListValue* list, int resource_id) {
+  Value* value;
+  scoped_ptr<base::ListValue> to_append(LoadSchemaList(resource_id));
+  while (to_append->Remove(0, &value)) {
+    list->Append(value);
+  }
+}
+
+ExtensionAPI::ExtensionAPI() {
+  value_.reset(LoadSchemaList(IDR_EXTENSION_API_JSON));
+  AppendExtraSchemaList(value_.get(), IDR_EXTENSION_API_JSON_EXTENSION);
 }
 
 ExtensionAPI::~ExtensionAPI() {
 }
 
 bool ExtensionAPI::IsPrivileged(const std::string& full_name) const {
   std::vector<std::string> split_full_name;
   base::SplitString(full_name, '.', &split_full_name);
   std::string name = split_full_name.back();
   split_full_name.pop_back();
@@ skipping 43 matching lines @@
 
   bool unprivileged = false;
   DictionaryValue* child = FindListItem(child_list, "name", child_name);
   if (!child || !child->GetBoolean("unprivileged", &unprivileged))
     return true;
 
   return !unprivileged;
 }
 
 }