Split feature definitions into extensions and chrome features.

chrome/renderer/extensions/dispatcher.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/dispatcher.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/debug/alias.h"
-#include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
+#include "base/values.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/crash_keys.h"
 #include "chrome/common/extensions/features/feature_channel.h"
 #include "chrome/common/extensions/manifest_handlers/externally_connectable.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/chrome_render_process_observer.h"
 #include "chrome/renderer/extensions/api_activity_logger.h"
 #include "chrome/renderer/extensions/app_bindings.h"
 #include "chrome/renderer/extensions/app_runtime_custom_bindings.h"
@@ skipping 18 matching lines @@
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/v8_value_converter.h"
 #include "extensions/common/api/messaging/message.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_api.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/extension_urls.h"
 #include "extensions/common/features/feature.h"
 #include "extensions/common/features/feature_provider.h"
+#include "extensions/common/features/json_feature_provider_source.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 #include "extensions/common/manifest_handlers/sandboxed_page_info.h"
 #include "extensions/common/message_bundle.h"
 #include "extensions/common/permissions/permission_set.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/switches.h"
 #include "extensions/common/view_type.h"
 #include "extensions/renderer/api_definitions_natives.h"
@@ skipping 13 matching lines @@
 #include "extensions/renderer/object_backed_native_handler.h"
 #include "extensions/renderer/render_view_observer_natives.h"
 #include "extensions/renderer/request_sender.h"
 #include "extensions/renderer/safe_builtins.h"
 #include "extensions/renderer/script_context.h"
 #include "extensions/renderer/script_context_set.h"
 #include "extensions/renderer/send_request_natives.h"
 #include "extensions/renderer/set_icon_natives.h"
 #include "extensions/renderer/utils_native_handler.h"
 #include "grit/common_resources.h"
+#include "grit/extensions_resources.h"
 #include "grit/renderer_resources.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/web/WebCustomElement.h"
 #include "third_party/WebKit/public/web/WebDataSource.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "third_party/WebKit/public/web/WebScopedUserGesture.h"
 #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
@@ skipping 55 matching lines @@
  public:
   explicit TestFeaturesNativeHandler(ScriptContext* context)
       : ObjectBackedNativeHandler(context) {
     RouteFunction("GetAPIFeatures",
         base::Bind(&TestFeaturesNativeHandler::GetAPIFeatures,
                    base::Unretained(this)));
   }
 
  private:
   void GetAPIFeatures(const v8::FunctionCallbackInfo<v8::Value>& args) {
-    base::Value* value = base::JSONReader::Read(
-        ResourceBundle::GetSharedInstance().GetRawDataResource(
-            IDR_EXTENSION_API_FEATURES).as_string());
+    JSONFeatureProviderSource source("api");
+    source.LoadJSON(IDR_CHROME_EXTENSION_API_FEATURES);
+    source.LoadJSON(IDR_EXTENSION_API_FEATURES);
     scoped_ptr<content::V8ValueConverter> converter(
         content::V8ValueConverter::create());
     args.GetReturnValue().Set(
-        converter->ToV8Value(value, context()->v8_context()));
+        converter->ToV8Value(&source.dictionary(), context()->v8_context()));
   }
 };
 
 class UserGesturesNativeHandler : public ObjectBackedNativeHandler {
  public:
   explicit UserGesturesNativeHandler(ScriptContext* context)
       : ObjectBackedNativeHandler(context) {
     RouteFunction("IsProcessingUserGesture",
         base::Bind(&UserGesturesNativeHandler::IsProcessingUserGesture,
                    base::Unretained(this)));
@@ skipping 1522 matching lines @@
 }
 
 void Dispatcher::ClearPortData(int port_id) {
   // Only the target port side has entries in |port_to_tab_id_map_|. If
   // |port_id| is a source port, std::map::erase() will just silently fail
   // here as a no-op.
   port_to_tab_id_map_.erase(port_id);
 }
 
 }  // namespace extensions