Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1598)

Unified Diff: content/renderer/p2p/socket_client.cc

Issue 7584011: Fix DCHECK in P2PSocketClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/p2p/socket_client.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/p2p/socket_client.cc
diff --git a/content/renderer/p2p/socket_client.cc b/content/renderer/p2p/socket_client.cc
index 55fcee569b62217698070426b1fa3fbc9b6bfedf..7937d27d0223290289ea008222fb8b20c0a0256b 100644
--- a/content/renderer/p2p/socket_client.cc
+++ b/content/renderer/p2p/socket_client.cc
@@ -11,7 +11,7 @@
P2PSocketClient::P2PSocketClient(P2PSocketDispatcher* dispatcher)
: dispatcher_(dispatcher),
ipc_message_loop_(dispatcher->message_loop()),
- delegate_message_loop_(NULL),
+ delegate_message_loop_(base::MessageLoopProxy::CreateForCurrentThread()),
socket_id_(0), delegate_(NULL),
state_(STATE_UNINITIALIZED) {
}
@@ -21,21 +21,21 @@ P2PSocketClient::~P2PSocketClient() {
}
void P2PSocketClient::Init(
- P2PSocketType type, const net::IPEndPoint& local_address,
- const net::IPEndPoint& remote_address, P2PSocketClient::Delegate* delegate,
- scoped_refptr<base::MessageLoopProxy> delegate_loop) {
+ P2PSocketType type,
+ const net::IPEndPoint& local_address,
+ const net::IPEndPoint& remote_address,
+ P2PSocketClient::Delegate* delegate) {
if (!ipc_message_loop_->BelongsToCurrentThread()) {
ipc_message_loop_->PostTask(
FROM_HERE, NewRunnableMethod(
- this, &P2PSocketClient::Init, type, local_address, remote_address,
- delegate, delegate_loop));
+ this, &P2PSocketClient::Init, type, local_address,
+ remote_address, delegate));
return;
}
DCHECK_EQ(state_, STATE_UNINITIALIZED);
state_ = STATE_OPENING;
delegate_ = delegate;
- delegate_message_loop_ = delegate_loop;
socket_id_ = dispatcher_->RegisterClient(this);
dispatcher_->SendP2PMessage(new P2PHostMsg_CreateSocket(
0, type, socket_id_, local_address, remote_address));
« no previous file with comments | « content/renderer/p2p/socket_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698