Remove prerender cookie store, part 4.

chrome/browser/prerender/prerender_resource_throttle_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 <set>
 #include <utility>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 199 matching lines @@
 
   test_contents()->Start();
   RunEvents();
 
   // Fake a request.
   net::TestURLRequestContext url_request_context;
   DeferredRedirectDelegate delegate;
   scoped_ptr<net::URLRequest> request(url_request_context.CreateRequest(
       net::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),
       net::DEFAULT_PRIORITY,
-      &delegate,
-      NULL));
+      &delegate));
   content::ResourceRequestInfo::AllocateForTesting(
       request.get(),
       content::RESOURCE_TYPE_IMAGE,
       NULL,
       kDefaultChildId,
       kDefaultRouteId,
       MSG_ROUTING_NONE,
       false,  // is_main_frame
       false,  // parent_is_main_frame
       true,   // allow_download
@@ skipping 25 matching lines @@
 
   test_contents()->Start();
   RunEvents();
 
   // Fake a request.
   net::TestURLRequestContext url_request_context;
   DeferredRedirectDelegate delegate;
   scoped_ptr<net::URLRequest> request(url_request_context.CreateRequest(
       net::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),
       net::DEFAULT_PRIORITY,
-      &delegate,
-      NULL));
+      &delegate));
   content::ResourceRequestInfo::AllocateForTesting(
       request.get(),
       content::RESOURCE_TYPE_MAIN_FRAME,
       NULL,
       kDefaultChildId,
       kDefaultRouteId,
       MSG_ROUTING_NONE,
       true,   // is_main_frame
       false,  // parent_is_main_frame
       true,   // allow_download
@@ skipping 23 matching lines @@
 
   test_contents()->Start();
   RunEvents();
 
   // Fake a request.
   net::TestURLRequestContext url_request_context;
   DeferredRedirectDelegate delegate;
   scoped_ptr<net::URLRequest> request(url_request_context.CreateRequest(
       net::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),
       net::DEFAULT_PRIORITY,
-      &delegate,
-      NULL));
+      &delegate));
   content::ResourceRequestInfo::AllocateForTesting(
       request.get(),
       content::RESOURCE_TYPE_XHR,
       NULL,
       kDefaultChildId,
       kDefaultRouteId,
       MSG_ROUTING_NONE,
       false,   // is_main_frame
       false,   // parent_is_main_frame
       true,   // allow_download
@@ skipping 12 matching lines @@
   // We should have cancelled the prerender.
   EXPECT_EQ(FINAL_STATUS_BAD_DEFERRED_REDIRECT,
             test_contents()->final_status());
 
   // Cleanup work so the prerender is gone.
   test_contents()->Cancel();
   RunEvents();
 }
 
 }  // namespace prerender