Make miscellaneous_bindings and event_bindings Required as needed. Previously

chrome/renderer/extensions/dispatcher.h

Index: chrome/renderer/extensions/dispatcher.h
diff --git a/chrome/renderer/extensions/dispatcher.h b/chrome/renderer/extensions/dispatcher.h
index ec002adfb71cdffe453b5d07d9b9e0f88a7802ae..f4d012bab1ef23a7e2b3780490f76d88c72bdbb3 100644
--- a/chrome/renderer/extensions/dispatcher.h
+++ b/chrome/renderer/extensions/dispatcher.h
@@ -129,6 +129,14 @@ class Dispatcher : public content::RenderProcessObserver {
   bool CheckContextAccessToExtensionAPI(
       const std::string& function_name, ChromeV8Context* context) const;
 
+  // Calls a method |method_name| in a module |module_name| belonging to the
+  // module system from |context|. Intended as a callback target from
+  // ChromeV8ContextSet::ForEach. Public to be called from ExtensionHelper.
+  static void CallModuleMethod(const std::string& module_name,
+                               const std::string& method_name,
+                               const base::ListValue* args,
+                               ChromeV8Context* context);
+
  private:
   friend class RenderViewTest;
   FRIEND_TEST_ALL_PREFIXES(RendererPermissionsPolicyDelegateTest,
@@ -144,6 +152,7 @@ class Dispatcher : public content::RenderProcessObserver {
 
   void OnSetChannel(int channel);
   void OnMessageInvoke(const std::string& extension_id,
+                       const std::string& module_name,
                        const std::string& function_name,
                        const base::ListValue& args,
                        bool user_gesture);
@@ -151,7 +160,7 @@ class Dispatcher : public content::RenderProcessObserver {
                            const std::string& channel_name,
                            const base::DictionaryValue& source_tab,
                            const ExtensionMsg_ExternalConnectionInfo& info);
-  void OnDeliverMessage(int target_port_id, const std::string& message);
+  void OnDeliverMessage(int target_port_id, const base::ListValue& message);
   void OnDispatchOnDisconnect(int port_id, const std::string& error_message);
   void OnSetFunctionNames(const std::vector<std::string>& names);
   void OnLoaded(