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

content/browser/renderer_host/resource_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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 
 #include <set>
 #include <vector>
@@ skipping 44 matching lines @@
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host_delegate.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
 #include "content/public/browser/resource_dispatcher_host_login_delegate.h"
 #include "content/public/browser/resource_throttle.h"
 #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"
 #include "net/base/load_flags.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/registry_controlled_domain.h"
 #include "net/base/request_priority.h"
 #include "net/base/ssl_cert_request_info.h"
 #include "net/base/upload_data.h"
@@ skipping 302 matching lines @@
                                               request_id, throttles.Pass());
     }
   }
   return handler;
 }
 
 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() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   is_shutdown_ = true;
   for (PendingRequestList::const_iterator i = pending_requests_.begin();
        i != pending_requests_.end(); ++i) {
     transferred_navigations_.erase(i->first);
   }
   STLDeleteValues(&pending_requests_);
@@ skipping 1019 matching lines @@
 }
 
 void ResourceDispatcherHost::OnSSLCertificateError(
     net::URLRequest* request,
     const net::SSLInfo& ssl_info,
     bool is_hsts_host) {
   DCHECK(request);
   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);
 
   if (request->status().is_success()) {
     if (PauseRequestIfNeeded(info)) {
       VLOG(1) << "OnResponseStarted pausing: " << request->url().spec();
       return;
     }
 
@@ skipping 817 matching lines @@
   scoped_refptr<ResourceHandler> transferred_resource_handler(
       new DoomedResourceHandler(info->resource_handler()));
   info->set_resource_handler(transferred_resource_handler.get());
 }
 
 bool ResourceDispatcherHost::IsTransferredNavigation(
     const content::GlobalRequestID& transferred_request_id) const {
   return transferred_navigations_.find(transferred_request_id) !=
       transferred_navigations_.end();
 }