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

content/browser/loader/resource_loader_unittest.cc

 // Copyright (c) 2013 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 "content/browser/loader/resource_loader.h"
 
 #include "base/run_loop.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/loader/resource_loader_delegate.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/test/mock_resource_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/test/test_content_browser_client.h"
+#include "net/base/request_priority.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/client_cert_store.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 namespace {
 
@@ skipping 180 matching lines @@
 };
 
 // Verifies if a call to net::UrlRequest::Delegate::OnCertificateRequested()
 // causes client cert store to be queried for certificates and if the returned
 // certificates are correctly passed to the content browser client for
 // selection.
 TEST_F(ResourceLoaderTest, ClientCertStoreLookup) {
   const int kRenderProcessId = 1;
   const int kRenderViewId = 2;
 
-  scoped_ptr<net::URLRequest> request(new net::URLRequest(
-      GURL("dummy"), NULL,
-      resource_context_.GetRequestContext()));
+  scoped_ptr<net::URLRequest> request(
+      new net::URLRequest(GURL("dummy"),
+                          net::DEFAULT_PRIORITY,
+                          NULL,
+                          resource_context_.GetRequestContext(),
+                          NULL));

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

Again, seems like we shouldn't be depending on resource_context_'s request
context having a NULL delegate.

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

removed arg.

   ResourceRequestInfo::AllocateForTesting(request.get(),
                                           ResourceType::MAIN_FRAME,
                                           &resource_context_,
                                           kRenderProcessId,
                                           kRenderViewId,
                                           false);
 
   // Set up the test client cert store.
   net::CertificateList dummy_certs(1, scoped_refptr<net::X509Certificate>(
       new net::X509Certificate("test", "test", base::Time(), base::Time())));
@@ skipping 41 matching lines @@
 }
 
 // Verifies if a call to net::URLRequest::Delegate::OnCertificateRequested()
 // on a platform with a NULL client cert store still calls the content browser
 // client for selection.
 TEST_F(ResourceLoaderTest, ClientCertStoreNull) {
   const int kRenderProcessId = 1;
   const int kRenderViewId = 2;
 
   scoped_ptr<net::URLRequest> request(new net::URLRequest(
-      GURL("dummy"), NULL, resource_context_.GetRequestContext()));
+      GURL("dummy"), net::DEFAULT_PRIORITY, NULL, resource_context_.GetRequestContext(), NULL));
   ResourceRequestInfo::AllocateForTesting(request.get(),
                                           ResourceType::MAIN_FRAME,
                                           &resource_context_,
                                           kRenderProcessId,
                                           kRenderViewId,
                                           false);
 
   // Ownership of the |request| is about to be turned over to ResourceLoader. We
   // need to keep a raw pointer copy to access this object later.
   net::URLRequest* raw_ptr_to_request = request.get();
@@ skipping 19 matching lines @@
   // Restore the original content browser client.
   SetBrowserClientForTesting(old_client);
 
   // Check if the SelectClientCertificate was called on the content browser
   // client.
   EXPECT_EQ(1, test_client.call_count());
   EXPECT_EQ(net::CertificateList(), test_client.passed_certs());
 }
 
 }  // namespace content