1 files changed, 13 insertions, 5 deletions
diff --git a/chromium/content/browser/message_port_message_filter.h b/chromium/content/browser/message_port_message_filter.h
index 0dd38c94e6c..64d07d6c328 100644
--- a/chromium/content/browser/message_port_message_filter.h
+++ b/chromium/content/browser/message_port_message_filter.h
@@ -6,13 +6,14 @@
 #define CONTENT_BROWSER_MESSAGE_PORT_MESSAGE_FILTER_H_
 
 #include "base/callback.h"
+#include "content/common/content_export.h"
 #include "content/public/browser/browser_message_filter.h"
 
 namespace content {
 
 // Filter for MessagePort related IPC messages (creating and destroying a
 // MessagePort, sending a message via a MessagePort etc).
-class MessagePortMessageFilter : public BrowserMessageFilter {
+class CONTENT_EXPORT MessagePortMessageFilter : public BrowserMessageFilter {
  public:
   typedef base::Callback<int(void)> NextRoutingIDCallback;
 
@@ -22,18 +23,25 @@ class MessagePortMessageFilter : public BrowserMessageFilter {
 
   // BrowserMessageFilter implementation.
   virtual void OnChannelClosing() OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void OnDestruct() const OVERRIDE;
 
   int GetNextRoutingID();
 
+  // Updates message ports registered for |message_port_ids| and returns
+  // new routing IDs for the updated ports via |new_routing_ids|.
+  void UpdateMessagePortsWithNewRoutes(
+      const std::vector<int>& message_port_ids,
+      std::vector<int>* new_routing_ids);
+
+ protected:
+  // This is protected, so we can define sub classes for testing.
+  virtual ~MessagePortMessageFilter();
+
  private:
   friend class BrowserThread;
   friend class base::DeleteHelper<MessagePortMessageFilter>;
 
-  virtual ~MessagePortMessageFilter();
-
   // Message handlers.
   void OnCreateMessagePort(int* route_id, int* message_port_id);