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 23e646f9ac26b3a0027a4180c9266abaabd217d9..980b58d5e666506dec24d6bafa65ab5f913f13dd 100644 |
--- a/content/browser/renderer_host/socket_stream_dispatcher_host.cc |
+++ b/content/browser/renderer_host/socket_stream_dispatcher_host.cc |
@@ -151,16 +151,39 @@ void SocketStreamDispatcherHost::OnSSLCertificateError( |
bool SocketStreamDispatcherHost::CanGetCookies(net::SocketStream* socket, |
const GURL& url) { |
+ int socket_id = SocketStreamHost::SocketIdFromSocketStream(socket); |
+ if (socket_id == kNoSocketId) { |
+ return false; |
+ } |
+ SocketStreamHost* socket_stream_host = hosts_.Lookup(socket_id); |
+ DCHECK(socket_stream_host); |
return GetContentClient()->browser()->AllowGetCookie( |
- url, url, net::CookieList(), resource_context_, 0, MSG_ROUTING_NONE); |
+ url, |
+ url, |
+ net::CookieList(), |
+ resource_context_, |
+ render_process_id_, |
+ socket_stream_host->render_frame_id()); |
} |
bool SocketStreamDispatcherHost::CanSetCookie(net::SocketStream* request, |
const GURL& url, |
const std::string& cookie_line, |
net::CookieOptions* options) { |
+ int socket_id = SocketStreamHost::SocketIdFromSocketStream(request); |
+ if (socket_id == kNoSocketId) { |
+ return false; |
+ } |
+ SocketStreamHost* socket_stream_host = hosts_.Lookup(socket_id); |
+ DCHECK(socket_stream_host); |
return GetContentClient()->browser()->AllowSetCookie( |
- url, url, cookie_line, resource_context_, 0, MSG_ROUTING_NONE, options); |
+ url, |
+ url, |
+ cookie_line, |
+ resource_context_, |
+ render_process_id_, |
+ socket_stream_host->render_frame_id(), |
+ options); |
} |
void SocketStreamDispatcherHost::CancelSSLRequest( |