| Index: content/browser/renderer_host/socket_stream_dispatcher_host.cc
|
| diff --git a/content/browser/renderer_host/socket_stream_dispatcher_host.cc b/content/browser/renderer_host/socket_stream_dispatcher_host.cc
|
| index 28952e75365c4126b77bd4e5720482c20a9e197b..e6ed98570fcd604c6e8e29d95a801d3222226c55 100644
|
| --- a/content/browser/renderer_host/socket_stream_dispatcher_host.cc
|
| +++ b/content/browser/renderer_host/socket_stream_dispatcher_host.cc
|
| @@ -134,15 +134,19 @@ bool SocketStreamDispatcherHost::CanSetCookie(net::SocketStream* request,
|
| }
|
|
|
| // Message handlers called by OnMessageReceived.
|
| -void SocketStreamDispatcherHost::OnConnect(const GURL& url, int socket_id) {
|
| - DVLOG(1) << "SocketStreamDispatcherHost::OnConnect url=" << url
|
| +void SocketStreamDispatcherHost::OnConnect(int routing_id,
|
| + const GURL& url,
|
| + int socket_id) {
|
| + DVLOG(1) << "SocketStreamDispatcherHost::OnConnect routing_id=" << routing_id
|
| + << " url=" << url
|
| << " socket_id=" << socket_id;
|
| DCHECK_NE(content::kNoSocketId, socket_id);
|
| if (hosts_.Lookup(socket_id)) {
|
| LOG(ERROR) << "socket_id=" << socket_id << " already registered.";
|
| return;
|
| }
|
| - SocketStreamHost* socket_stream_host = new SocketStreamHost(this, socket_id);
|
| + SocketStreamHost* socket_stream_host =
|
| + new SocketStreamHost(this, routing_id, socket_id);
|
| hosts_.AddWithID(socket_stream_host, socket_id);
|
| socket_stream_host->Connect(url, GetURLRequestContext());
|
| DVLOG(1) << "SocketStreamDispatcherHost::OnConnect -> " << socket_id;
|
|
|