Make miscellaneous_bindings and event_bindings Required as needed. Previously

chrome/browser/extensions/api/messaging/message_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_MESSAGING_MESSAGE_SERVICE_H_
 #define CHROME_BROWSER_EXTENSIONS_API_MESSAGING_MESSAGE_SERVICE_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/extensions/api/messaging/native_message_process_host.h"
 #include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class GURL;
 class Profile;
 
 namespace base {
 class DictionaryValue;
+class ListValue;
 }
 
 namespace content {
 class RenderProcessHost;
 class WebContents;
 }
 
 namespace extensions {
 class Extension;
 class ExtensionHost;
@@ skipping 40 matching lines @@
                                    const std::string& source_extension_id,
                                    const std::string& target_extension_id,
                                    const GURL& source_url) {}
 
     // Notify the port that the channel has been closed. If |error_message| is
     // non-empty, it indicates an error occurred while opening the connection.
     virtual void DispatchOnDisconnect(int source_port_id,
                                       const std::string& error_message) {}
 
     // Dispatch a message to this end of the communication.
-    virtual void DispatchOnMessage(const std::string& message,
+    virtual void DispatchOnMessage(scoped_ptr<base::ListValue> message,
                                    int target_port_id) = 0;
 
     // MessagPorts that target extensions will need to adjust their keepalive
     // counts for their lazy background page.
     virtual void IncrementLazyKeepaliveCount() {}
     virtual void DecrementLazyKeepaliveCount() {}
 
     // Get the RenderProcessHost (if any) associated with the port.
     virtual content::RenderProcessHost* GetRenderProcessHost();
 
@@ skipping 41 matching lines @@
       int receiver_port_id,
       const std::string& source_extension_id,
       const std::string& native_app_name);
 
   // Closes the message channel associated with the given port, and notifies
   // the other side.
   virtual void CloseChannel(int port_id,
                             const std::string& error_message) OVERRIDE;
 
   // Sends a message to the given port.
-  void PostMessage(int port_id, const std::string& message);
+  void PostMessage(int port_id, scoped_ptr<base::ListValue> message);
 
   // NativeMessageProcessHost::Client
   virtual void PostMessageFromNativeProcess(
       int port_id,
-      const std::string& message) OVERRIDE;
+      scoped_ptr<base::ListValue> message) OVERRIDE;
 
  private:
   friend class MockMessageService;
   friend class ProfileKeyedAPIFactory<MessageService>;
   struct OpenChannelParams;
 
   // A map of channel ID to its channel object.
   typedef std::map<int, MessageChannel*> MessageChannelMap;
 
   // A map of channel ID to information about the extension that is waiting
@@ skipping 35 matching lines @@
   void PendingOpenChannel(scoped_ptr<OpenChannelParams> params,
                           int source_process_id,
                           extensions::ExtensionHost* host);
   void PendingCloseChannel(int port_id,
                            const std::string& error_message,
                            extensions::ExtensionHost* host) {
     if (host)
       CloseChannel(port_id, error_message);
   }
   void PendingPostMessage(int port_id,
-                          const std::string& message,
+                          scoped_ptr<base::ListValue> message,
                           extensions::ExtensionHost* host) {
     if (host)
-      PostMessage(port_id, message);
+      PostMessage(port_id, message.Pass());
   }
 
   // ProfileKeyedAPI implementation.
   static const char* service_name() {
     return "MessageService";
   }
   static const bool kServiceRedirectedInIncognito = true;
 
   content::NotificationRegistrar registrar_;
   MessageChannelMap channels_;
   PendingChannelMap pending_channels_;
 
   // Weak pointer. Guaranteed to outlive this class.
   LazyBackgroundTaskQueue* lazy_background_task_queue_;
 
   base::WeakPtrFactory<MessageService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageService);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_MESSAGING_MESSAGE_SERVICE_H_