Make miscellaneous_bindings and event_bindings Required as needed. Previously

chrome/renderer/extensions/extension_helper.cc

Index: chrome/renderer/extensions/extension_helper.cc
diff --git a/chrome/renderer/extensions/extension_helper.cc b/chrome/renderer/extensions/extension_helper.cc
index c61221bbb8db7a7a65f07b1cfb708cbd09f901ca..2d9bb711169bbf753d2083b7a7d15ad98449bd02 100644
--- a/chrome/renderer/extensions/extension_helper.cc
+++ b/chrome/renderer/extensions/extension_helper.cc
@@ -11,6 +11,7 @@
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
+#include "base/values.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/render_messages.h"
@@ -250,16 +251,20 @@ void ExtensionHelper::OnExtensionResponse(int request_id,
 }
 
 void ExtensionHelper::OnExtensionMessageInvoke(const std::string& extension_id,
+                                               const std::string& module_name,
                                                const std::string& function_name,
                                                const base::ListValue& args,
                                                bool user_gesture) {
   scoped_ptr<WebScopedUserGesture> web_user_gesture;
-  if (user_gesture) {
+  if (user_gesture)
     web_user_gesture.reset(new WebScopedUserGesture);
-  }
-
-  dispatcher_->v8_context_set().DispatchChromeHiddenMethod(
-      extension_id, function_name, args, render_view());
+  dispatcher_->v8_context_set().ForEach(
+      extension_id,
+      render_view(),
+      base::Bind(&Dispatcher::CallModuleMethod,
+                 module_name,
+                 function_name,
+                 &args));
 }
 
 void ExtensionHelper::OnExtensionDispatchOnConnect(
@@ -274,8 +279,9 @@ void ExtensionHelper::OnExtensionDispatchOnConnect(
       render_view());
 }
 
-void ExtensionHelper::OnExtensionDeliverMessage(int target_id,
-                                                const std::string& message) {
+void ExtensionHelper::OnExtensionDeliverMessage(
+    int target_id,
+    const base::ListValue& message) {
   MiscellaneousBindings::DeliverMessage(dispatcher_->v8_context_set().GetAll(),
                                         target_id,
                                         message,
@@ -363,7 +369,8 @@ void ExtensionHelper::OnAppWindowClosed() {
       dispatcher_->v8_context_set().GetByV8Context(script_context);
   if (!chrome_v8_context)
     return;
-  chrome_v8_context->CallChromeHiddenMethod("OnAppWindowClosed", 0, NULL, NULL);
+  chrome_v8_context->module_system()->CallModuleMethod(
+      "app.window", "onAppWindowClosed");
 }
 
 }  // namespace extensions