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

Unified Diff: content/browser/renderer_host/socket_stream_dispatcher_host.cc

Issue 261883006: Makes SocketStreamDispatcherHost::CanGetCookies pass frame_id (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Handles kNoSocketId Created 6 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698