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

chrome/browser/search_engines/template_url_fetcher_unittest.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 "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ skipping 129 matching lines @@
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &osdd_full_path));
     osdd_full_path = osdd_full_path.AppendASCII(osdd_file_name);
     ASSERT_TRUE(file_util::PathExists(osdd_full_path));
     ASSERT_FALSE(file_util::DirectoryExists(osdd_full_path));
   }
 
   // Start the fetch.
   GURL osdd_url = test_server_.GetURL("files/" + osdd_file_name);
   GURL favicon_url;
   test_util_.profile()->GetTemplateURLFetcher()->ScheduleDownload(
-      keyword, osdd_url, favicon_url, new TemplateURLFetcherTestCallbacks(this),
-      provider_type);
+      keyword, osdd_url, favicon_url, NULL /* web_contents */,

[Peter Kasting, 2012/03/08 20:46:27]

Nit: No need for the /* */ comment since none of the other args have comments.

+      new TemplateURLFetcherTestCallbacks(this), provider_type);
 }
 
 void TemplateURLFetcherTest::WaitForDownloadToFinish() {
   ASSERT_FALSE(waiting_for_download_);
   waiting_for_download_ = true;
   MessageLoop::current()->Run();
   waiting_for_download_ = false;
 }
 
 TEST_F(TemplateURLFetcherTest, BasicAutodetectedTest) {
@@ skipping 143 matching lines @@
   StartDownload(keyword, osdd_file_name,
                 TemplateURLFetcher::EXPLICIT_PROVIDER, true);
   ASSERT_EQ(0, add_provider_called_);
   ASSERT_EQ(1, callbacks_destroyed_);
 
   WaitForDownloadToFinish();
   ASSERT_EQ(1, add_provider_called_);
   ASSERT_EQ(2, callbacks_destroyed_);
   ASSERT_TRUE(last_callback_template_url_.get());
 }