Remove prerender cookie store, part 4.

chrome/browser/net/chrome_network_delegate_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 "chrome/browser/net/chrome_network_delegate.h"
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 65 matching lines @@
     return make_scoped_ptr(
         new ChromeNetworkDelegate(forwarder(), &pref_member_));
   }
 
   // Implementation moved here for access to private bits.
   void NeverThrottleLogicImpl() {
     scoped_ptr<ChromeNetworkDelegate> delegate(CreateNetworkDelegate());
 
     net::TestURLRequestContext context;
     scoped_ptr<net::URLRequest> extension_request(context.CreateRequest(
-        GURL("http://example.com/"), net::DEFAULT_PRIORITY, NULL, NULL));
+        GURL("http://example.com/"), net::DEFAULT_PRIORITY, NULL));
     extension_request->set_first_party_for_cookies(
         GURL("chrome-extension://abcdef/bingo.html"));
     scoped_ptr<net::URLRequest> web_page_request(context.CreateRequest(
-        GURL("http://example.com/"), net::DEFAULT_PRIORITY, NULL, NULL));
+        GURL("http://example.com/"), net::DEFAULT_PRIORITY, NULL));
     web_page_request->set_first_party_for_cookies(
         GURL("http://example.com/helloworld.html"));
 
     ASSERT_TRUE(delegate->OnCanThrottleRequest(*extension_request));
     ASSERT_FALSE(delegate->OnCanThrottleRequest(*web_page_request));
 
     delegate->NeverThrottleRequests();
     ASSERT_TRUE(ChromeNetworkDelegate::g_never_throttle_requests_);
     ASSERT_FALSE(delegate->OnCanThrottleRequest(*extension_request));
     ASSERT_FALSE(delegate->OnCanThrottleRequest(*web_page_request));
@@ skipping 69 matching lines @@
   }
 
   // Does a request to an arbitrary URL and verifies that the SafeSearch
   // enforcement utility functions were called/not called as expected.
   void QueryURL(bool expect_google_safe_search,
                 bool expect_youtube_safety_mode) {
     safe_search_util::ClearForceGoogleSafeSearchCountForTesting();
     safe_search_util::ClearForceYouTubeSafetyModeCountForTesting();
 
     scoped_ptr<net::URLRequest> request(context_.CreateRequest(
-        GURL("http://anyurl.com"), net::DEFAULT_PRIORITY, &delegate_, NULL));
+        GURL("http://anyurl.com"), net::DEFAULT_PRIORITY, &delegate_));
 
     request->Start();
     base::MessageLoop::current()->RunUntilIdle();
 
     EXPECT_EQ(expect_google_safe_search ? 1 : 0,
         safe_search_util::GetForceGoogleSafeSearchCountForTesting());
     EXPECT_EQ(expect_youtube_safety_mode ? 1 : 0,
         safe_search_util::GetForceYouTubeSafetyModeCountForTesting());
   }
 
@@ skipping 148 matching lines @@
                                                        kBlockedFirstPartySite));
 
   cookie_settings_->SetCookieSetting(
       ContentSettingsPattern::FromURL(kBlockedFirstPartySite),
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTING_BLOCK);
   // Privacy mode is disabled as kAllowedSite is still getting cookies
   EXPECT_FALSE(network_delegate_->CanEnablePrivacyMode(kAllowedSite,
                                                        kBlockedFirstPartySite));
 }