Commit c37fe20e authored by hjd@google.com's avatar hjd@google.com

Makes SocketStreamDispatcherHost::CanGetCookies pass frame_id

BUG=369496

Review URL: https://codereview.chromium.org/261883006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270056 0039d316-1c4b-4281-b951-d872f2087c98
parent 0bf3a234
...@@ -151,16 +151,39 @@ void SocketStreamDispatcherHost::OnSSLCertificateError( ...@@ -151,16 +151,39 @@ void SocketStreamDispatcherHost::OnSSLCertificateError(
bool SocketStreamDispatcherHost::CanGetCookies(net::SocketStream* socket, bool SocketStreamDispatcherHost::CanGetCookies(net::SocketStream* socket,
const GURL& url) { 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( 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, bool SocketStreamDispatcherHost::CanSetCookie(net::SocketStream* request,
const GURL& url, const GURL& url,
const std::string& cookie_line, const std::string& cookie_line,
net::CookieOptions* options) { 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( 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( void SocketStreamDispatcherHost::CancelSSLRequest(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment