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

chrome/browser/search_engines/template_url_fetcher.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 "build/build_config.h"
 
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_fetcher_callbacks.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/search_engines/template_url_parser.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "content/browser/renderer_host/render_view_host.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
+#include "content/public/browser/render_process_host.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/common/content_url_request_user_data.h"
 #include "content/public/common/url_fetcher.h"
 #include "content/public/common/url_fetcher_delegate.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_status.h"
 
 // RequestDelegate ------------------------------------------------------------
 class TemplateURLFetcher::RequestDelegate
     : public content::URLFetcherDelegate,
       public content::NotificationObserver {
  public:
   // Takes ownership of |callbacks|.
   RequestDelegate(TemplateURLFetcher* fetcher,
                   const string16& keyword,
                   const GURL& osdd_url,
                   const GURL& favicon_url,
+                  content::WebContents* web_contents,
                   TemplateURLFetcherCallbacks* callbacks,
                   ProviderType provider_type);
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details);
 
   // content::URLFetcherDelegate:
   // If data contains a valid OSDD, a TemplateURL is created and added to
@@ skipping 25 matching lines @@
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(RequestDelegate);
 };
 
 TemplateURLFetcher::RequestDelegate::RequestDelegate(
     TemplateURLFetcher* fetcher,
     const string16& keyword,
     const GURL& osdd_url,
     const GURL& favicon_url,
+    content::WebContents* web_contents,
     TemplateURLFetcherCallbacks* callbacks,
     ProviderType provider_type)
     : ALLOW_THIS_IN_INITIALIZER_LIST(url_fetcher_(content::URLFetcher::Create(
           osdd_url, content::URLFetcher::GET, this))),
       fetcher_(fetcher),
       keyword_(keyword),
       osdd_url_(osdd_url),
       favicon_url_(favicon_url),
       provider_type_(provider_type),
       callbacks_(callbacks) {
   TemplateURLService* model = TemplateURLServiceFactory::GetForProfile(
       fetcher_->profile());
   DCHECK(model);  // TemplateURLFetcher::ScheduleDownload verifies this.
 
   if (!model->loaded()) {
     // Start the model load and set-up waiting for it.
     registrar_.Add(this,
                    chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
                    content::Source<TemplateURLService>(model));
     model->Load();
   }
 
   url_fetcher_->SetRequestContext(fetcher->profile()->GetRequestContext());
-  url_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES);
+  // Can be NULL during tests.
+  if (web_contents) {
+    url_fetcher_->SetContentURLRequestUserData(
+        new content::ContentURLRequestUserData(
+            web_contents->GetRenderProcessHost()->GetID(),
+            web_contents->GetRenderViewHost()->routing_id()));
+  } else {
+    url_fetcher_->SetContentURLRequestUserData(
+        new content::ContentURLRequestUserData());
+  }
+
   url_fetcher_->Start();
 }
 
 void TemplateURLFetcher::RequestDelegate::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(type == chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED);
 
   if (!template_url_.get())
@@ skipping 118 matching lines @@
   DCHECK(profile_);
 }
 
 TemplateURLFetcher::~TemplateURLFetcher() {
 }
 
 void TemplateURLFetcher::ScheduleDownload(
     const string16& keyword,
     const GURL& osdd_url,
     const GURL& favicon_url,
+    content::WebContents* web_contents,
     TemplateURLFetcherCallbacks* callbacks,
     ProviderType provider_type) {
   DCHECK(osdd_url.is_valid());
   scoped_ptr<TemplateURLFetcherCallbacks> owned_callbacks(callbacks);
 
   // For JS added OSDD empty keyword is OK because we will generate keyword
   // later from OSDD content.
   if (provider_type == TemplateURLFetcher::AUTODETECTED_PROVIDER &&
       keyword.empty())
     return;
@@ skipping 21 matching lines @@
   }
 
   // Make sure we aren't already downloading this request.
   for (std::vector<RequestDelegate*>::iterator i = requests_->begin();
        i != requests_->end(); ++i) {
     if ((*i)->url() == osdd_url || (*i)->keyword() == keyword)
       return;
   }
 
   requests_->push_back(
-      new RequestDelegate(this, keyword, osdd_url, favicon_url,
+      new RequestDelegate(this, keyword, osdd_url, favicon_url, web_contents,
                           owned_callbacks.release(), provider_type));
 }
 
 void TemplateURLFetcher::RequestCompleted(RequestDelegate* request) {
   DCHECK(std::find(requests_->begin(), requests_->end(), request) !=
          requests_->end());
   requests_->erase(std::find(requests_->begin(), requests_->end(), request));
   delete request;
 }