Allow API functions and events to have entries in _api_features.json

chrome/renderer/extensions/chrome_v8_context.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/chrome_v8_context.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_split.h"
 #include "base/values.h"
 #include "chrome/common/extensions/api/extension_api.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_set.h"
+#include "chrome/common/extensions/features/base_feature_provider.h"
 #include "chrome/renderer/extensions/chrome_v8_extension.h"
 #include "chrome/renderer/extensions/module_system.h"
 #include "chrome/renderer/extensions/user_script_slave.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/v8_value_converter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "v8/include/v8.h"
 
 using content::V8ValueConverter;
@@ skipping 120 matching lines @@
       web_frame_->callFunctionEvenIfScriptDisabled(function,
                                                    v8::Object::New(),
                                                    argc,
                                                    argv);
   if (result)
     *result = result_temp;
 
   return true;
 }
 
+bool ChromeV8Context::IsAnyFeatureAvailableToContext(
+    const std::string& api_name) {
+  return ExtensionAPI::GetSharedInstance()->IsAnyFeatureAvailableToContext(
+      api_name,
+      context_type_,
+      UserScriptSlave::GetDataSourceURLForFrame(web_frame_));
+}
+
 Feature::Availability ChromeV8Context::GetAvailability(
     const std::string& api_name) {
-  return GetAvailabilityInternal(api_name, extension_);
-}
-
-Feature::Availability ChromeV8Context::GetAvailabilityForContext(
-    const std::string& api_name) {
-  return GetAvailabilityInternal(api_name, NULL);
-}
-
-Feature::Availability ChromeV8Context::GetAvailabilityInternal(
-    const std::string& api_name,
-    const Extension* extension) {
   return ExtensionAPI::GetSharedInstance()->IsAvailable(
       api_name,
-      extension,
+      extension_,
       context_type_,
       UserScriptSlave::GetDataSourceURLForFrame(web_frame_));
 }
 
 void ChromeV8Context::DispatchOnUnloadEvent() {
   v8::HandleScope handle_scope;
   CallChromeHiddenMethod("dispatchOnUnload", 0, NULL, NULL);
 }
 
 std::string ChromeV8Context::GetContextTypeDescription() {
@@ skipping 35 matching lines @@
   // string if a validation error has occured.
   if (DCHECK_IS_ON()) {
     if (!retval.IsEmpty() && !retval->IsUndefined()) {
       std::string error = *v8::String::AsciiValue(retval);
       DCHECK(false) << error;
     }
   }
 }
 
 }  // namespace extensions