Makes SocketStreamDispatcherHost::CanGetCookies pass frame_id

content/browser/renderer_host/socket_stream_dispatcher_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/socket_stream_dispatcher_host.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "content/browser/renderer_host/socket_stream_host.h"
@@ skipping 133 matching lines @@
   DCHECK(socket_stream_host);
   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_frame_id(),
       ssl_info, fatal);
 }
 
 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(
     const GlobalRequestID& id,
     int error,
     const net::SSLInfo* ssl_info) {
   int socket_id = id.request_id;
   DVLOG(2) << "SocketStreamDispatcherHost::CancelSSLRequest socket_id="
            << socket_id;
   DCHECK_NE(kNoSocketId, socket_id);
@@ skipping 101 matching lines @@
        iter.Advance()) {
     int socket_id = iter.GetCurrentKey();
     const SocketStreamHost* socket_stream_host = iter.GetCurrentValue();
     delete socket_stream_host;
     hosts_.Remove(socket_id);
   }
   on_shutdown_ = true;
 }
 
 }  // namespace content