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

net/url_request/url_request_ftp_job_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 "net/url_request/url_request_ftp_job.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/run_loop.h"
+#include "net/base/request_priority.h"
 #include "net/ftp/ftp_auth_cache.h"
 #include "net/http/http_transaction_unittest.h"
 #include "net/proxy/mock_proxy_resolver.h"
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/socket/socket_test_util.h"
 #include "net/url_request/ftp_protocol_handler.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job_factory_impl.h"
@@ skipping 94 matching lines @@
 
   virtual void Suspend(bool suspend) OVERRIDE {}
 };
 
 // Fixture for priority-related tests. Priority matters when there is
 // an HTTP proxy.
 class URLRequestFtpJobPriorityTest : public testing::Test {
  protected:
   URLRequestFtpJobPriorityTest()
       : proxy_service_(new SimpleProxyConfigService, NULL, NULL),
-        req_(GURL("ftp://ftp.example.com"), &delegate_, &context_, NULL) {
+        req_(GURL("ftp://ftp.example.com"),
+             DEFAULT_PRIORITY,
+             &delegate_,
+             &context_) {
     context_.set_proxy_service(&proxy_service_);
     context_.set_http_transaction_factory(&network_layer_);
   }
 
   ProxyService proxy_service_;
   MockNetworkLayer network_layer_;
   MockFtpTransactionFactory ftp_factory_;
   FtpAuthCache ftp_auth_cache_;
   TestURLRequestContext context_;
   TestDelegate delegate_;
@@ skipping 120 matching lines @@
   MockRead reads[] = {
     MockRead(ASYNC, 1, "HTTP/1.1 200 OK\r\n"),
     MockRead(ASYNC, 2, "Content-Length: 9\r\n\r\n"),
     MockRead(ASYNC, 3, "test.html"),
   };
 
   AddSocket(reads, arraysize(reads), writes, arraysize(writes));
 
   TestDelegate request_delegate;
   URLRequest url_request(GURL("ftp://ftp.example.com/"),
+                         DEFAULT_PRIORITY,
                          &request_delegate,
-                         request_context(),
-                         network_delegate());
+                         request_context());
   url_request.Start();
   ASSERT_TRUE(url_request.is_pending());
   socket_data(0)->RunFor(4);
 
   EXPECT_TRUE(url_request.status().is_success());
   EXPECT_EQ(1, network_delegate()->completed_requests());
   EXPECT_EQ(0, network_delegate()->error_count());
   EXPECT_FALSE(request_delegate.auth_required_called());
   EXPECT_EQ("test.html", request_delegate.data_received());
 }
 
 // Regression test for http://crbug.com/237526 .
 TEST_F(URLRequestFtpJobTest, FtpProxyRequestOrphanJob) {
   // Use a PAC URL so that URLRequestFtpJob's |pac_request_| field is non-NULL.
   request_context()->set_proxy_service(
       new ProxyService(
           new ProxyConfigServiceFixed(
               ProxyConfig::CreateFromCustomPacURL(GURL("http://foo"))),
           new MockAsyncProxyResolver, NULL));
 
   TestDelegate request_delegate;
   URLRequest url_request(GURL("ftp://ftp.example.com/"),
+                         DEFAULT_PRIORITY,
                          &request_delegate,
-                         request_context(),
-                         network_delegate());
+                         request_context());
   url_request.Start();
 
   // Now |url_request| will be deleted before its completion,
   // resulting in it being orphaned. It should not crash.
 }
 
 TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedProxyAuthNoCredentials) {
   MockWrite writes[] = {
     MockWrite(ASYNC, 0, "GET ftp://ftp.example.com/ HTTP/1.1\r\n"
               "Host: ftp.example.com\r\n"
               "Proxy-Connection: keep-alive\r\n\r\n"),
   };
   MockRead reads[] = {
     // No credentials.
     MockRead(ASYNC, 1, "HTTP/1.1 407 Proxy Authentication Required\r\n"),
     MockRead(ASYNC, 2, "Proxy-Authenticate: Basic "
              "realm=\"MyRealm1\"\r\n"),
     MockRead(ASYNC, 3, "Content-Length: 9\r\n\r\n"),
     MockRead(ASYNC, 4, "test.html"),
   };
 
   AddSocket(reads, arraysize(reads), writes, arraysize(writes));
 
   TestDelegate request_delegate;
   URLRequest url_request(GURL("ftp://ftp.example.com/"),
+                         DEFAULT_PRIORITY,
                          &request_delegate,
-                         request_context(),
-                         network_delegate());
+                         request_context());
   url_request.Start();
   ASSERT_TRUE(url_request.is_pending());
   socket_data(0)->RunFor(5);
 
   EXPECT_TRUE(url_request.status().is_success());
   EXPECT_EQ(1, network_delegate()->completed_requests());
   EXPECT_EQ(0, network_delegate()->error_count());
   EXPECT_TRUE(request_delegate.auth_required_called());
   EXPECT_EQ("test.html", request_delegate.data_received());
 }
@@ skipping 21 matching lines @@
     MockRead(ASYNC, 7, "Content-Length: 10\r\n\r\n"),
     MockRead(ASYNC, 8, "test2.html"),
   };
 
   AddSocket(reads, arraysize(reads), writes, arraysize(writes));
 
   TestDelegate request_delegate;
   request_delegate.set_credentials(
       AuthCredentials(ASCIIToUTF16("myuser"), ASCIIToUTF16("mypass")));
   URLRequest url_request(GURL("ftp://ftp.example.com/"),
+                         DEFAULT_PRIORITY,
                          &request_delegate,
-                         request_context(),
-                         network_delegate());
+                         request_context());
   url_request.Start();
   ASSERT_TRUE(url_request.is_pending());
   socket_data(0)->RunFor(9);
 
   EXPECT_TRUE(url_request.status().is_success());
   EXPECT_EQ(1, network_delegate()->completed_requests());
   EXPECT_EQ(0, network_delegate()->error_count());
   EXPECT_TRUE(request_delegate.auth_required_called());
   EXPECT_EQ("test2.html", request_delegate.data_received());
 }
@@ skipping 10 matching lines @@
     MockRead(ASYNC, 2, "WWW-Authenticate: Basic "
              "realm=\"MyRealm1\"\r\n"),
     MockRead(ASYNC, 3, "Content-Length: 9\r\n\r\n"),
     MockRead(ASYNC, 4, "test.html"),
   };
 
   AddSocket(reads, arraysize(reads), writes, arraysize(writes));
 
   TestDelegate request_delegate;
   URLRequest url_request(GURL("ftp://ftp.example.com/"),
+                         DEFAULT_PRIORITY,
                          &request_delegate,
-                         request_context(),
-                         network_delegate());
+                         request_context());
   url_request.Start();
   ASSERT_TRUE(url_request.is_pending());
   socket_data(0)->RunFor(5);
 
   EXPECT_TRUE(url_request.status().is_success());
   EXPECT_EQ(1, network_delegate()->completed_requests());
   EXPECT_EQ(0, network_delegate()->error_count());
   EXPECT_TRUE(request_delegate.auth_required_called());
   EXPECT_EQ("test.html", request_delegate.data_received());
 }
@@ skipping 21 matching lines @@
     MockRead(ASYNC, 7, "Content-Length: 10\r\n\r\n"),
     MockRead(ASYNC, 8, "test2.html"),
   };
 
   AddSocket(reads, arraysize(reads), writes, arraysize(writes));
 
   TestDelegate request_delegate;
   request_delegate.set_credentials(
       AuthCredentials(ASCIIToUTF16("myuser"), ASCIIToUTF16("mypass")));
   URLRequest url_request(GURL("ftp://ftp.example.com/"),
+                         DEFAULT_PRIORITY,
                          &request_delegate,
-                         request_context(),
-                         network_delegate());
+                         request_context());
   url_request.Start();
   ASSERT_TRUE(url_request.is_pending());
   socket_data(0)->RunFor(9);
 
   EXPECT_TRUE(url_request.status().is_success());
   EXPECT_EQ(1, network_delegate()->completed_requests());
   EXPECT_EQ(0, network_delegate()->error_count());
   EXPECT_TRUE(request_delegate.auth_required_called());
   EXPECT_EQ("test2.html", request_delegate.data_received());
 }
@@ skipping 42 matching lines @@
 
   // Make sure cached FTP credentials are not used for proxy authentication.
   request_context()->GetFtpAuthCache()->Add(
       url.GetOrigin(),
       AuthCredentials(ASCIIToUTF16("userdonotuse"),
                       ASCIIToUTF16("passworddonotuse")));
 
   TestDelegate request_delegate;
   request_delegate.set_credentials(
       AuthCredentials(ASCIIToUTF16("proxyuser"), ASCIIToUTF16("proxypass")));
-  URLRequest url_request(url,
-                         &request_delegate,
-                         request_context(),
-                         network_delegate());
+  URLRequest url_request(
+      url, DEFAULT_PRIORITY, &request_delegate, request_context());
   url_request.Start();
   ASSERT_TRUE(url_request.is_pending());
   socket_data(0)->RunFor(5);
 
   request_delegate.set_credentials(
       AuthCredentials(ASCIIToUTF16("myuser"), ASCIIToUTF16("mypass")));
   socket_data(0)->RunFor(9);
 
   EXPECT_TRUE(url_request.status().is_success());
   EXPECT_EQ(1, network_delegate()->completed_requests());
@@ skipping 12 matching lines @@
     MockRead(ASYNC, 1, "HTTP/1.1 200 OK\r\n"),
     MockRead(ASYNC, 2, "Content-Length: 9\r\n"),
     MockRead(ASYNC, 3, "Set-Cookie: name=value\r\n\r\n"),
     MockRead(ASYNC, 4, "test.html"),
   };
 
   AddSocket(reads, arraysize(reads), writes, arraysize(writes));
 
   TestDelegate request_delegate;
   URLRequest url_request(GURL("ftp://ftp.example.com/"),
+                         DEFAULT_PRIORITY,
                          &request_delegate,
-                         request_context(),
-                         network_delegate());
+                         request_context());
   url_request.Start();
   ASSERT_TRUE(url_request.is_pending());
 
   socket_data(0)->RunFor(5);
 
   EXPECT_TRUE(url_request.status().is_success());
   EXPECT_EQ(1, network_delegate()->completed_requests());
   EXPECT_EQ(0, network_delegate()->error_count());
 
   // Make sure we do not accept cookies.
@@ skipping 11 matching lines @@
   };
   MockRead reads[] = {
     MockRead(SYNCHRONOUS, 1, "HTTP/1.1 302 Found\r\n"),
     MockRead(ASYNC, 2, "Location: http://other.example.com/\r\n\r\n"),
   };
 
   AddSocket(reads, arraysize(reads), writes, arraysize(writes));
 
   TestDelegate request_delegate;
   URLRequest url_request(GURL("ftp://ftp.example.com/"),
+                         DEFAULT_PRIORITY,
                          &request_delegate,
-                         request_context(),
-                         network_delegate());
+                         request_context());
   url_request.Start();
   EXPECT_TRUE(url_request.is_pending());
 
   base::MessageLoop::current()->RunUntilIdle();
 
   EXPECT_TRUE(url_request.is_pending());
   EXPECT_EQ(0, request_delegate.response_started_count());
   EXPECT_EQ(0, network_delegate()->error_count());
   ASSERT_TRUE(url_request.status().is_success());
 
@@ skipping 21 matching lines @@
     MockRead(ASYNC, 3, "test1.html"),
     MockRead(ASYNC, 5, "HTTP/1.1 200 OK\r\n"),
     MockRead(ASYNC, 6, "Content-Length: 10\r\n\r\n"),
     MockRead(ASYNC, 7, "test2.html"),
   };
 
   AddSocket(reads, arraysize(reads), writes, arraysize(writes));
 
   TestDelegate request_delegate1;
   URLRequest url_request1(GURL("ftp://ftp.example.com/first"),
+                          DEFAULT_PRIORITY,
                           &request_delegate1,
-                          request_context(),
-                          network_delegate());
+                          request_context());
   url_request1.Start();
   ASSERT_TRUE(url_request1.is_pending());
   socket_data(0)->RunFor(4);
 
   EXPECT_TRUE(url_request1.status().is_success());
   EXPECT_EQ(1, network_delegate()->completed_requests());
   EXPECT_EQ(0, network_delegate()->error_count());
   EXPECT_FALSE(request_delegate1.auth_required_called());
   EXPECT_EQ("test1.html", request_delegate1.data_received());
 
   TestDelegate request_delegate2;
   URLRequest url_request2(GURL("ftp://ftp.example.com/second"),
+                          DEFAULT_PRIORITY,
                           &request_delegate2,
-                          request_context(),
-                          network_delegate());
+                          request_context());
   url_request2.Start();
   ASSERT_TRUE(url_request2.is_pending());
   socket_data(0)->RunFor(4);
 
   EXPECT_TRUE(url_request2.status().is_success());
   EXPECT_EQ(2, network_delegate()->completed_requests());
   EXPECT_EQ(0, network_delegate()->error_count());
   EXPECT_FALSE(request_delegate2.auth_required_called());
   EXPECT_EQ("test2.html", request_delegate2.data_received());
 }
@@ skipping 23 matching lines @@
     MockRead(ASYNC, 1, "HTTP/1.1 200 OK\r\n"),
     MockRead(ASYNC, 2, "Content-Length: 10\r\n\r\n"),
     MockRead(ASYNC, 3, "test2.html"),
   };
 
   AddSocket(reads1, arraysize(reads1), writes1, arraysize(writes1));
   AddSocket(reads2, arraysize(reads2), writes2, arraysize(writes2));
 
   TestDelegate request_delegate1;
   URLRequest url_request1(GURL("ftp://ftp.example.com/first"),
+                          DEFAULT_PRIORITY,
                           &request_delegate1,
-                          request_context(),
-                          network_delegate());
+                          request_context());
   url_request1.Start();
   ASSERT_TRUE(url_request1.is_pending());
   socket_data(0)->RunFor(4);
 
   EXPECT_TRUE(url_request1.status().is_success());
   EXPECT_EQ(1, network_delegate()->completed_requests());
   EXPECT_EQ(0, network_delegate()->error_count());
   EXPECT_FALSE(request_delegate1.auth_required_called());
   EXPECT_EQ("test1.html", request_delegate1.data_received());
 
   TestDelegate request_delegate2;
   URLRequest url_request2(GURL("http://ftp.example.com/second"),
+                          DEFAULT_PRIORITY,
                           &request_delegate2,
-                          request_context(),
-                          network_delegate());
+                          request_context());
   url_request2.Start();
   ASSERT_TRUE(url_request2.is_pending());
   socket_data(1)->RunFor(4);
 
   EXPECT_TRUE(url_request2.status().is_success());
   EXPECT_EQ(2, network_delegate()->completed_requests());
   EXPECT_EQ(0, network_delegate()->error_count());
   EXPECT_FALSE(request_delegate2.auth_required_called());
   EXPECT_EQ("test2.html", request_delegate2.data_received());
 }
 
 }  // namespace
 
 }  // namespace net