[Net] Add a priority parameter to URLRequest's constructor

chrome/browser/prerender/prerender_tracker_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"
 #include "base/run_loop.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_resource_throttle.h"
 #include "chrome/browser/prerender/prerender_tracker.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/test/net/url_request_mock_http_job.h"
+#include "net/base/request_priority.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
 namespace prerender {
 
 namespace {
 
@@ skipping 487 matching lines @@
   test_contents()->Start();
   // This calls AddPrerenderOnIOThreadTask().
   RunEvents();
   EXPECT_TRUE(prerender_tracker()->IsPrerenderingOnIOThread(
       kDefaultChildId, kDefaultRouteId));
 
   // Fake a request.
   net::TestURLRequestContext url_request_context;
   DeferredRedirectDelegate delegate;
   net::URLRequest request(
-      content::URLRequestMockHTTPJob::GetMockUrl(
-          base::FilePath(kRedirectPath)),
-      &delegate, &url_request_context);
+      content::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),
+      net::DEFAULT_PRIORITY,
+      &delegate,
+      &url_request_context,
+      NULL);

[mmenke, 2013/10/30 15:27:11]

Again, don't want to add assumptions here.

[akalin, 2013/10/30 21:44:37]

removed arg.

   content::ResourceRequestInfo::AllocateForTesting(
       &request, ResourceType::IMAGE, NULL,
       kDefaultChildId, kDefaultRouteId, true);
 
   // Install a prerender throttle.
   PrerenderResourceThrottle throttle(&request, prerender_tracker());
   delegate.SetThrottle(&throttle);
 
   // Start the request and wait for a redirect.
   request.Start();
@@ skipping 16 matching lines @@
   test_contents()->Start();
   // This calls AddPrerenderOnIOThreadTask().
   RunEvents();
   EXPECT_TRUE(prerender_tracker()->IsPrerenderingOnIOThread(
       kDefaultChildId, kDefaultRouteId));
 
   // Fake a request.
   net::TestURLRequestContext url_request_context;
   DeferredRedirectDelegate delegate;
   net::URLRequest request(
-      content::URLRequestMockHTTPJob::GetMockUrl(
-          base::FilePath(kRedirectPath)),
-      &delegate, &url_request_context);
+      content::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),
+      net::DEFAULT_PRIORITY,
+      &delegate,
+      &url_request_context,
+      NULL);
   content::ResourceRequestInfo::AllocateForTesting(
       &request, ResourceType::IMAGE, NULL,
       kDefaultChildId, kDefaultRouteId, true);
 
   // Install a prerender throttle.
   PrerenderResourceThrottle throttle(&request, prerender_tracker());
   delegate.SetThrottle(&throttle);
 
   // Start the request and wait for a redirect.
   request.Start();
@@ skipping 16 matching lines @@
   test_contents()->Start();
   // This calls AddPrerenderOnIOThreadTask().
   RunEvents();
   EXPECT_TRUE(prerender_tracker()->IsPrerenderingOnIOThread(
       kDefaultChildId, kDefaultRouteId));
 
   // Fake a request.
   net::TestURLRequestContext url_request_context;
   DeferredRedirectDelegate delegate;
   net::URLRequest request(
-      content::URLRequestMockHTTPJob::GetMockUrl(
-          base::FilePath(kRedirectPath)),
-      &delegate, &url_request_context);
+      content::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),
+      net::DEFAULT_PRIORITY,
+      &delegate,
+      &url_request_context,
+      NULL);
   content::ResourceRequestInfo::AllocateForTesting(
       &request, ResourceType::MAIN_FRAME, NULL,
       kDefaultChildId, kDefaultRouteId, true);
 
   // Install a prerender throttle.
   PrerenderResourceThrottle throttle(&request, prerender_tracker());
   delegate.SetThrottle(&throttle);
 
   // Start the request and wait for a redirect. This time, it should
   // not be deferred.
@@ skipping 15 matching lines @@
   test_contents()->Start();
   // This calls AddPrerenderOnIOThreadTask().
   RunEvents();
   EXPECT_TRUE(prerender_tracker()->IsPrerenderingOnIOThread(
       kDefaultChildId, kDefaultRouteId));
 
   // Fake a request.
   net::TestURLRequestContext url_request_context;
   DeferredRedirectDelegate delegate;
   net::URLRequest request(
-      content::URLRequestMockHTTPJob::GetMockUrl(
-          base::FilePath(kRedirectPath)),
-      &delegate, &url_request_context);
+      content::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),
+      net::DEFAULT_PRIORITY,
+      &delegate,
+      &url_request_context,
+      NULL);
   content::ResourceRequestInfo::AllocateForTesting(
       &request, ResourceType::XHR, NULL,
       kDefaultChildId, kDefaultRouteId, false);
 
   // Install a prerender throttle.
   PrerenderResourceThrottle throttle(&request, prerender_tracker());
   delegate.SetThrottle(&throttle);
 
   // Start the request and wait for a redirect.
   request.Start();
   delegate.Run();
   EXPECT_FALSE(delegate.was_deferred());
 
   // We should have cancelled the prerender.
   EXPECT_EQ(FINAL_STATUS_BAD_DEFERRED_REDIRECT, GetCurrentStatus(
       kDefaultChildId, kDefaultRouteId));
 
   // Cleanup work so the prerender is gone.
   test_contents()->Cancel();
   RunEvents();
 }
 
 }  // namespace prerender