Make SocketStreamDispatcherHost a BrowserMessageFilter....

chrome/browser/renderer_host/socket_stream_dispatcher_host.h

Index: chrome/browser/renderer_host/socket_stream_dispatcher_host.h
===================================================================
--- chrome/browser/renderer_host/socket_stream_dispatcher_host.h	(revision 69086)
+++ chrome/browser/renderer_host/socket_stream_dispatcher_host.h	(working copy)
@@ -9,8 +9,7 @@
 #include <vector>
 
 #include "base/id_map.h"
-#include "chrome/browser/renderer_host/resource_dispatcher_host.h"
-#include "ipc/ipc_message.h"
+#include "chrome/browser/browser_message_filter.h"
 #include "net/socket_stream/socket_stream.h"
 
 class GURL;
@@ -19,14 +18,16 @@
 // Dispatches ViewHostMsg_SocketStream_* messages sent from renderer.
 // It also acts as SocketStream::Delegate so that it sends
 // ViewMsg_SocketStream_* messages back to renderer.
-class SocketStreamDispatcherHost : public net::SocketStream::Delegate {
+class SocketStreamDispatcherHost : public BrowserMessageFilter,
+                                   public net::SocketStream::Delegate {
  public:
   SocketStreamDispatcherHost();
   virtual ~SocketStreamDispatcherHost();
 
-  bool OnMessageReceived(const IPC::Message& msg,
-                         ResourceDispatcherHost::Receiver* receiver,
-                         bool* msg_ok);
+  // BrowserMessageFilter methods.
+  virtual bool OnMessageReceived(const IPC::Message& message,
+                                 bool* message_was_ok);
+
   // The object died, so cancel and detach all requests associated with it.
   void CancelRequestsForProcess(int host_id);
 
@@ -44,21 +45,10 @@
   void OnSendData(int socket_id, const std::vector<char>& data);
   void OnCloseReq(int socket_id);
 
-  void DeleteSocketStreamHost(int host_id, int socket_id);
+  void DeleteSocketStreamHost(int socket_id);
 
-  void AddHostMap(int host_id, int socket_id,
-                  SocketStreamHost* socket_stream_host);
-  SocketStreamHost* LookupHostMap(int host_id, int socket_id);
+  IDMap<SocketStreamHost> hosts_;
 
-  // Returns true if the message passed in is a SocketStream related message.
-  static bool IsSocketStreamDispatcherHostMessage(const IPC::Message& message);
-
-  // key: host_id -> { key: socket_id -> value: SocketStreamHost }
-  IDMap< IDMap<SocketStreamHost> > hostmap_;
-
-  // valid while OnMessageReceived processing.
-  ResourceDispatcherHost::Receiver* receiver_;
-
   DISALLOW_COPY_AND_ASSIGN(SocketStreamDispatcherHost);
 };