Do cookie checks in NetworkDelegate instead of the URLRequest::Delegate.

content/browser/renderer_host/resource_dispatcher_host.cc

Index: content/browser/renderer_host/resource_dispatcher_host.cc
diff --git a/content/browser/renderer_host/resource_dispatcher_host.cc b/content/browser/renderer_host/resource_dispatcher_host.cc
index 452dd7bfd1370ac5ec9ca80f7ec6a82b51fff91c..e16e446541173c03b8db7d3fae4db11f403b9a7b 100644
--- a/content/browser/renderer_host/resource_dispatcher_host.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host.cc
@@ -62,6 +62,7 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/process_type.h"
 #include "content/public/common/url_constants.h"
+#include "content/public/common/url_request_user_data.h"
 #include "net/base/auth.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/cookie_monster.h"
@@ -384,6 +385,9 @@ void ResourceDispatcherHost::SetRequestInfo(
     net::URLRequest* request,
     ResourceDispatcherHostRequestInfo* info) {
   request->SetUserData(NULL, info);
+  request->SetUserData(
+      content::URLRequestUserData::kUserDataKey,
+      new content::URLRequestUserData(info->child_id(), info->route_id()));
 }
 
 void ResourceDispatcherHost::OnShutdown() {
@@ -1423,36 +1427,6 @@ void ResourceDispatcherHost::OnSSLCertificateError(
   SSLManager::OnSSLCertificateError(this, request, ssl_info, is_hsts_host);
 }
 
-bool ResourceDispatcherHost::CanGetCookies(
-    const net::URLRequest* request,
-    const net::CookieList& cookie_list) const {
-  VLOG(1) << "OnGetCookies: " << request->url().spec();
-  int render_process_id, render_view_id;
-  if (!RenderViewForRequest(request, &render_process_id, &render_view_id))
-    return false;
-
-  const ResourceDispatcherHostRequestInfo* info = InfoForRequest(request);
-
-  return content::GetContentClient()->browser()->AllowGetCookie(

[cbentzel, 2012/03/05 12:56:12]

You should be able to remove AllowGetCookie/AllowSetCookie from
ContentBrowserClient and derived classes now.

[jam, 2012/03/05 19:11:03]

really? it would be great if we can remove them, but they're also called by
other places

[jochen (gone - plz use gerrit), 2012/03/06 18:39:54]

Yes, the WebSocket implementation still uses it (no, WebSockets don't use the
NetworkDelegate nor URLRequest::Delegate :( )

[willchan no longer on Chromium, 2012/03/06 18:42:29]

FWIW, we're merging the WebSocket implementation with the HTTP stack. It won't
use URLRequest::Delegate, but it's likely to use NetworkDelegate for the shared
portions.

-      request->url(), request->first_party_for_cookies(), cookie_list,
-      info->context(), render_process_id, render_view_id);
-}
-
-bool ResourceDispatcherHost::CanSetCookie(const net::URLRequest* request,
-                                          const std::string& cookie_line,
-                                          net::CookieOptions* options) const {
-  VLOG(1) << "OnSetCookie: " << request->url().spec();
-
-  int render_process_id, render_view_id;
-  if (!RenderViewForRequest(request, &render_process_id, &render_view_id))
-    return false;
-
-  const ResourceDispatcherHostRequestInfo* info = InfoForRequest(request);
-  return content::GetContentClient()->browser()->AllowSetCookie(
-      request->url(), request->first_party_for_cookies(), cookie_line,
-      info->context(), render_process_id, render_view_id, options);
-}
-
 void ResourceDispatcherHost::OnResponseStarted(net::URLRequest* request) {
   VLOG(1) << "OnResponseStarted: " << request->url().spec();
   ResourceDispatcherHostRequestInfo* info = InfoForRequest(request);