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 Value* LoadValue(int resource_id) {

[not at google - send to devlin, 2011/12/07 23:26:00]

LoadSchema or something might be more descriptive.
Also, we can avoid a lot of static_casting below by returning a ListValue* here.

[koz (OOO until 15th September), 2011/12/09 19:24:18]

I've changed this to be a pair of functions LoadSchemaList() and
AppendSchemaList().

   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;
+  return result;
+}
 
-  value_.reset(static_cast<base::ListValue*>(temp_value.release()));
+ExtensionAPI::ExtensionAPI() {
+  value_.reset(
+      static_cast<base::ListValue*>(LoadValue(IDR_EXTENSION_API_JSON)));
+  value_->Append(LoadValue(IDR_EXTENSION_API_EXTENSION_JSON));

[not at google - send to devlin, 2011/12/07 23:26:00]

It sounds awkward, but names like IDR_EXTENSION_STORAGE_API_JSON will read
better than IDR_EXTENSION_API_EXTENSION_STORAGE_JSON so I'd call this
IDR_EXTENSION_EXTENSION_API_JSON.

[Aaron Boodman, 2011/12/07 23:30:35]

cute.

[koz (OOO until 15th September), 2011/12/09 19:24:18]

I've gone with aa's suggestion of 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;
 }
 
 }