Lazy load chrome.* APIs

chrome/renderer/extensions/runtime_custom_bindings.cc

Index: chrome/renderer/extensions/runtime_custom_bindings.cc
diff --git a/chrome/renderer/extensions/runtime_custom_bindings.cc b/chrome/renderer/extensions/runtime_custom_bindings.cc
index b775d49e7c69b4a1c676ee9e62df67efff586b18..96139f3a38746679a42a6640d6637733f65e0502 100644
--- a/chrome/renderer/extensions/runtime_custom_bindings.cc
+++ b/chrome/renderer/extensions/runtime_custom_bindings.cc
@@ -21,11 +21,14 @@ namespace extensions {
 
 RuntimeCustomBindings::RuntimeCustomBindings(Dispatcher* dispatcher,
                                              ChromeV8Context* context)
-    : ChromeV8Extension(dispatcher), context_(context) {
+    : ChromeV8Extension(dispatcher, context->v8_context()),
+      context_(context) {
   RouteFunction("GetManifest",
                 base::Bind(&RuntimeCustomBindings::GetManifest,
                            base::Unretained(this)));
-  RouteStaticFunction("OpenChannelToExtension", &OpenChannelToExtension);
+  RouteFunction("OpenChannelToExtension",
+                base::Bind(&RuntimeCustomBindings::OpenChannelToExtension,
+                           base::Unretained(this)));
   RouteFunction("OpenChannelToNativeApp",
                 base::Bind(&RuntimeCustomBindings::OpenChannelToNativeApp,
                            base::Unretained(this)));
@@ -33,12 +36,11 @@ RuntimeCustomBindings::RuntimeCustomBindings(Dispatcher* dispatcher,
 
 RuntimeCustomBindings::~RuntimeCustomBindings() {}
 
-// static
 v8::Handle<v8::Value> RuntimeCustomBindings::OpenChannelToExtension(
     const v8::Arguments& args) {
   // Get the current RenderView so that we can send a routed IPC message from
   // the correct source.
-  content::RenderView* renderview = GetCurrentRenderView();
+  content::RenderView* renderview = GetRenderView();
   if (!renderview)
     return v8::Undefined();
 
@@ -64,14 +66,14 @@ v8::Handle<v8::Value> RuntimeCustomBindings::OpenChannelToExtension(
 v8::Handle<v8::Value> RuntimeCustomBindings::OpenChannelToNativeApp(
     const v8::Arguments& args) {
   // Verify that the extension has permission to use native messaging.
-  if (!dispatcher()->CheckCurrentContextAccessToExtensionAPI(
-          "nativeMessaging")) {
+  if (!dispatcher()->CheckContextAccessToExtensionAPI(
+          "nativeMessaging", context_)) {
     return v8::Undefined();
   }
 
   // Get the current RenderView so that we can send a routed IPC message from
   // the correct source.
-  content::RenderView* renderview = GetCurrentRenderView();
+  content::RenderView* renderview = GetRenderView();
   if (!renderview)
     return v8::Undefined();