Remove prerender cookie store, part 4.

chrome/browser/policy/url_blacklist_manager_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 "components/policy/core/browser/url_blacklist_manager.h"
 
 #include <ostream>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ skipping 626 matching lines @@
 TEST_F(URLBlacklistManagerTest, DontBlockResources) {
   scoped_ptr<URLBlacklist> blacklist(new URLBlacklist(GetSegmentURLCallback()));
   scoped_ptr<base::ListValue> blocked(new base::ListValue);
   blocked->Append(new base::StringValue("google.com"));
   blacklist->Block(blocked.get());
   blacklist_manager_->SetBlacklist(blacklist.Pass());
   EXPECT_TRUE(blacklist_manager_->IsURLBlocked(GURL("http://google.com")));
 
   net::TestURLRequestContext context;
   scoped_ptr<net::URLRequest> request(context.CreateRequest(
-      GURL("http://google.com"), net::DEFAULT_PRIORITY, NULL, NULL));
+      GURL("http://google.com"), net::DEFAULT_PRIORITY, NULL));
 
   int reason = net::ERR_UNEXPECTED;
   // Background requests aren't filtered.
   EXPECT_FALSE(blacklist_manager_->IsRequestBlocked(*request.get(), &reason));
 
   // Main frames are filtered.
   request->SetLoadFlags(net::LOAD_MAIN_FRAME);
   EXPECT_TRUE(blacklist_manager_->IsRequestBlocked(*request.get(), &reason));
   EXPECT_EQ(net::ERR_BLOCKED_BY_ADMINISTRATOR, reason);
 
   // On most platforms, sync gets a free pass due to signin flows.
   bool block_signin_urls = false;
 #if defined(OS_CHROMEOS)
   // There are no sync specific signin flows on Chrome OS, so no special
   // treatment.
   block_signin_urls = true;
 #endif
 
   GURL sync_url(GaiaUrls::GetInstance()->service_login_url().Resolve(
       "?service=chromiumsync"));
   scoped_ptr<net::URLRequest> sync_request(context.CreateRequest(
-      sync_url, net::DEFAULT_PRIORITY, NULL, NULL));
+      sync_url, net::DEFAULT_PRIORITY, NULL));
   sync_request->SetLoadFlags(net::LOAD_MAIN_FRAME);
   EXPECT_EQ(block_signin_urls,
             blacklist_manager_->IsRequestBlocked(*sync_request.get(), &reason));
 }
 
 TEST_F(URLBlacklistManagerTest, DefaultBlacklistExceptions) {
   URLBlacklist blacklist(GetSegmentURLCallback());
   scoped_ptr<base::ListValue> blocked(new base::ListValue);
 
   // Blacklist everything:
@@ skipping 14 matching lines @@
   blacklist.Allow(allowed.get());
 
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://www.google.com")));
   EXPECT_TRUE((blacklist.IsURLBlocked(GURL("chrome-extension://xyz"))));
   EXPECT_FALSE((blacklist.IsURLBlocked(GURL("chrome-extension://abc"))));
   EXPECT_FALSE((blacklist.IsURLBlocked(GURL("chrome-search://local-ntp"))));
   EXPECT_FALSE((blacklist.IsURLBlocked(GURL("chrome-native://ntp"))));
 }
 
 }  // namespace policy