Refactor the P2PSocketDispatcher to be created on the RenderThread instead of the RenderView.

content/renderer/p2p/socket_dispatcher.cc

 // 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.
 
 #include "content/renderer/p2p/socket_dispatcher.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop_proxy.h"
+#include "content/common/child_process.h"
 #include "content/common/p2p_messages.h"
 #include "content/renderer/p2p/host_address_request.h"
 #include "content/renderer/p2p/socket_client.h"
 #include "content/renderer/render_view_impl.h"
 #include "webkit/glue/network_list_observer.h"
 
 namespace content {
 
 class P2PSocketDispatcher::AsyncMessageSender
     : public base::RefCountedThreadSafe<AsyncMessageSender> {
  public:
-  explicit AsyncMessageSender(IPC::Sender* message_sender)
-      : message_loop_(base::MessageLoopProxy::current()),
-        message_sender_(message_sender) {
+  explicit AsyncMessageSender(P2PSocketDispatcher* message_sender)
+      : message_sender_(message_sender) {
   }
 
   void Detach() {
-    DCHECK(message_loop_->BelongsToCurrentThread());
     message_sender_ = NULL;
   }
 
   void Send(IPC::Message* msg) {
-    message_loop_->PostTask(FROM_HERE,
-                            base::Bind(&AsyncMessageSender::DoSend, this, msg));
+    if (!message_sender_) {
+      delete msg;

[tommi (sloooow) - chröme, 2012/09/11 12:09:09]

maybe log an error or NOTREACHED?

[perkj_chrome, 2012/09/11 14:27:30]

removed

+      return;
+    }
+    base::MessageLoopProxy* loop = message_sender_->message_loop();
+    loop->PostTask(

[tommi (sloooow) - chröme, 2012/09/11 12:09:09]

what if you're already on the right thread?  Can't you just send the message
directly in that case?

[perkj_chrome, 2012/09/11 14:27:30]

Done.

+        FROM_HERE, base::Bind(&P2PSocketDispatcher::Send,
+                              message_sender_.get(), msg));
   }
 
  private:
   friend class base::RefCountedThreadSafe<AsyncMessageSender>;
   ~AsyncMessageSender() {}
 
-  void DoSend(IPC::Message* msg) {
-    DCHECK(message_loop_->BelongsToCurrentThread());
-    if (message_sender_)
-      message_sender_->Send(msg);
-  }
-
-  scoped_refptr<base::MessageLoopProxy> message_loop_;
-  IPC::Sender* message_sender_;
+  scoped_refptr<P2PSocketDispatcher> message_sender_;

[tommi (sloooow) - chröme, 2012/09/11 12:09:09]

Since both AsyncMessageSender and P2PSocketDispatcher are now reference counted,
is there a way to guarantee that both get deleted?  If we have a circular
reference somehow, then these objects might be leaked.

[perkj_chrome, 2012/09/11 14:27:30]

Removed the AsyncMessageSender.
On 2012/09/11 12:09:09, tommi wrote:

 
   DISALLOW_COPY_AND_ASSIGN(AsyncMessageSender);
 };
 
-P2PSocketDispatcher::P2PSocketDispatcher(RenderViewImpl* render_view)
-    : content::RenderViewObserver(render_view),
-      message_loop_(base::MessageLoopProxy::current()),
+P2PSocketDispatcher::P2PSocketDispatcher(
+    base::MessageLoopProxy* ipc_message_loop)
+    : message_loop_(ipc_message_loop),
       network_notifications_started_(false),
       network_list_observers_(
           new ObserverListThreadSafe<webkit_glue::NetworkListObserver>()),
-      async_message_sender_(new AsyncMessageSender(this)) {
+      async_message_sender_(new AsyncMessageSender(this)),
+      channel_(NULL) {
 }
 
 P2PSocketDispatcher::~P2PSocketDispatcher() {
-  FOR_EACH_OBSERVER(P2PSocketDispatcherDestructionObserver,
-                    destruction_observer_, OnSocketDispatcherDestroyed());
   network_list_observers_->AssertEmpty();
   if (network_notifications_started_)
-    Send(new P2PHostMsg_StopNetworkNotifications(routing_id()));
+    Send(new P2PHostMsg_StopNetworkNotifications());
   for (IDMap<P2PSocketClient>::iterator i(&clients_); !i.IsAtEnd();
        i.Advance()) {
     i.GetCurrentValue()->Detach();
   }
   async_message_sender_->Detach();
 }
 
 void P2PSocketDispatcher::AddNetworkListObserver(
     webkit_glue::NetworkListObserver* network_list_observer) {
   network_list_observers_->AddObserver(network_list_observer);
   network_notifications_started_ = true;
   async_message_sender_->Send(
-      new P2PHostMsg_StartNetworkNotifications(routing_id()));
+      new P2PHostMsg_StartNetworkNotifications());
 }
 
 void P2PSocketDispatcher::RemoveNetworkListObserver(
     webkit_glue::NetworkListObserver* network_list_observer) {
   network_list_observers_->RemoveObserver(network_list_observer);
 }
 
-void P2PSocketDispatcher::AddDestructionObserver(
-    P2PSocketDispatcherDestructionObserver* observer) {
-  destruction_observer_.AddObserver(observer);
-}
+void P2PSocketDispatcher::Send(IPC::Message* message) {
+  DCHECK(message_loop_->BelongsToCurrentThread());
+  if (!channel_) {
+    delete message;

[tommi (sloooow) - chröme, 2012/09/11 12:09:09]

log warning/error?

[perkj_chrome, 2012/09/11 14:27:30]

Done.

+    return;
+  }
 
-void P2PSocketDispatcher::RemoveDestructionObserver(
-    P2PSocketDispatcherDestructionObserver* observer) {
-  destruction_observer_.RemoveObserver(observer);
+  channel_->Send(message);
 }
 
 bool P2PSocketDispatcher::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(P2PSocketDispatcher, message)
     IPC_MESSAGE_HANDLER(P2PMsg_NetworkListChanged, OnNetworkListChanged)
     IPC_MESSAGE_HANDLER(P2PMsg_GetHostAddressResult, OnGetHostAddressResult)
     IPC_MESSAGE_HANDLER(P2PMsg_OnSocketCreated, OnSocketCreated)
     IPC_MESSAGE_HANDLER(P2PMsg_OnIncomingTcpConnection, OnIncomingTcpConnection)
     IPC_MESSAGE_HANDLER(P2PMsg_OnError, OnError)
     IPC_MESSAGE_HANDLER(P2PMsg_OnDataReceived, OnDataReceived)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
+void P2PSocketDispatcher::OnFilterAdded(IPC::Channel* channel) {
+  DVLOG(1) << "P2PSocketDispatcher::OnFilterAdded()";
+  // Captures the channel for IPC.

[tommi (sloooow) - chröme, 2012/09/11 12:09:09]

unnecessary comment

[perkj_chrome, 2012/09/11 14:27:30]

Done.

[tommi (sloooow) - chröme, 2012/09/11 15:08:58]

don't see the change

[perkj_chrome, 2012/09/11 15:21:57]

Done.

+  channel_ = channel;
+}
+
+void P2PSocketDispatcher::OnFilterRemoved() {
+  channel_ = NULL;
+}
+
+void P2PSocketDispatcher::OnChannelClosing() {
+  channel_ = NULL;

[tommi (sloooow) - chröme, 2012/09/11 12:09:09]

I think we should use this opportunity to delete/release objects such as the
async_message_sender_.  Otherwise it looks to me that these objects will never
be deleted.

[perkj_chrome, 2012/09/11 14:27:30]

Removed it all together. 
Changed Send2PMessage to accept calls from other message loops.

On 2012/09/11 12:09:09, tommi wrote:

[tommi (sloooow) - chröme, 2012/09/11 15:08:58]

great!

+}
+
 base::MessageLoopProxy* P2PSocketDispatcher::message_loop() {
   return message_loop_;
 }
 
 int P2PSocketDispatcher::RegisterClient(P2PSocketClient* client) {
+  DCHECK(message_loop_->BelongsToCurrentThread());
   return clients_.Add(client);
 }
 
 void P2PSocketDispatcher::UnregisterClient(int id) {
+  DCHECK(message_loop_->BelongsToCurrentThread());
   clients_.Remove(id);
 }
 
 void P2PSocketDispatcher::SendP2PMessage(IPC::Message* msg) {
-  msg->set_routing_id(routing_id());
+  DCHECK(message_loop_->BelongsToCurrentThread());
   Send(msg);
 }
 
 int P2PSocketDispatcher::RegisterHostAddressRequest(
     P2PHostAddressRequest* request) {
+  DCHECK(message_loop_->BelongsToCurrentThread());
   return host_address_requests_.Add(request);
 }
 
 void P2PSocketDispatcher::UnregisterHostAddressRequest(int id) {
+  DCHECK(message_loop_->BelongsToCurrentThread());
   host_address_requests_.Remove(id);
 }
 
 void P2PSocketDispatcher::OnNetworkListChanged(
     const net::NetworkInterfaceList& networks) {
   network_list_observers_->Notify(
       &webkit_glue::NetworkListObserver::OnNetworkListChanged, networks);
 }
 
 void P2PSocketDispatcher::OnGetHostAddressResult(
@@ skipping 47 matching lines @@
     // hasn't processed the close message by the time it sends the
     // message to the renderer.
     VLOG(1) << "Received P2P message for socket that doesn't exist.";
     return NULL;
   }
 
   return client;
 }
 
 }  // namespace content