Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / browser / renderer_host / socket_stream_dispatcher_host.cc

diff --git a/src/content/browser/renderer_host/socket_stream_dispatcher_host.cc b/src/content/browser/renderer_host/socket_stream_dispatcher_host.cc
index 677c281..23e646f 100644 (file)
--- a/src/content/browser/renderer_host/socket_stream_dispatcher_host.cc
+++ b/src/content/browser/renderer_host/socket_stream_dispatcher_host.cc
@@ -32,7 +32,8 @@ SocketStreamDispatcherHost::SocketStreamDispatcherHost(
     int render_process_id,
     const GetRequestContextCallback& request_context_callback,
     ResourceContext* resource_context)
-    : render_process_id_(render_process_id),
+    : BrowserMessageFilter(SocketStreamMsgStart),
+      render_process_id_(render_process_id),
       request_context_callback_(request_context_callback),
       resource_context_(resource_context),
       weak_ptr_factory_(this),
@@ -144,7 +145,7 @@ void SocketStreamDispatcherHost::OnSSLCertificateError(
   GlobalRequestID request_id(-1, socket_id);
   SSLManager::OnSSLCertificateError(
       weak_ptr_factory_.GetWeakPtr(), request_id, ResourceType::SUB_RESOURCE,
-      socket->url(), render_process_id_, socket_stream_host->render_view_id(),
+      socket->url(), render_process_id_, socket_stream_host->render_frame_id(),
       ssl_info, fatal);
 }
 
@@ -190,16 +191,16 @@ void SocketStreamDispatcherHost::ContinueSSLRequest(
 }
 
 SocketStreamDispatcherHost::~SocketStreamDispatcherHost() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   Shutdown();
 }
 
 // Message handlers called by OnMessageReceived.
-void SocketStreamDispatcherHost::OnConnect(int render_view_id,
+void SocketStreamDispatcherHost::OnConnect(int render_frame_id,
                                            const GURL& url,
                                            int socket_id) {
   DVLOG(2) << "SocketStreamDispatcherHost::OnConnect"
-           << " render_view_id=" << render_view_id
+           << " render_frame_id=" << render_frame_id
            << " url=" << url
            << " socket_id=" << socket_id;
   DCHECK_NE(kNoSocketId, socket_id);
@@ -223,7 +224,8 @@ void SocketStreamDispatcherHost::OnConnect(int render_view_id,
   // Note that the SocketStreamHost is responsible for checking that |url|
   // is valid.
   SocketStreamHost* socket_stream_host =
-      new SocketStreamHost(this, render_view_id, socket_id);
+      new SocketStreamHost(this, render_process_id_, render_frame_id,
+                           socket_id);
   hosts_.AddWithID(socket_stream_host, socket_id);
   socket_stream_host->Connect(url, GetURLRequestContext());
   DVLOG(2) << "SocketStreamDispatcherHost::OnConnect -> " << socket_id;
@@ -266,7 +268,7 @@ net::URLRequestContext* SocketStreamDispatcherHost::GetURLRequestContext() {
 }
 
 void SocketStreamDispatcherHost::Shutdown() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   // TODO(ukai): Implement IDMap::RemoveAll().
   for (IDMap<SocketStreamHost>::const_iterator iter(&hosts_);
        !iter.IsAtEnd();