net/url_request/url_request_ftp_job_unittest.cc - Issue 51953002: [Net] Add a priority parameter to URLRequest's constructor

Unified Diff: net/url_request/url_request_ftp_job_unittest.cc

Issue 51953002: [Net] Add a priority parameter to URLRequest's constructor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix compile error from rebase Created 7 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« net/url_request/url_request_context.cc ('K') | « net/url_request/url_request_filter_unittest.cc ('k') | net/url_request/url_request_http_job_unittest.cc » ('j') | net/url_request/url_request_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/url_request/url_request_ftp_job_unittest.cc

diff --git a/net/url_request/url_request_ftp_job_unittest.cc b/net/url_request/url_request_ftp_job_unittest.cc

index f9eafab54ba6dac2243118e10215eb3f8b64d6eb..ed20a898ff3936270e360928b8caca726c4ae2e2 100644

--- a/net/url_request/url_request_ftp_job_unittest.cc

+++ b/net/url_request/url_request_ftp_job_unittest.cc

@@ -7,6 +7,7 @@

#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"

@@ -121,7 +122,11 @@ 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_,

+ NULL) {

context_.set_proxy_service(&proxy_service_);

context_.set_http_transaction_factory(&network_layer_);

}

@@ -262,6 +267,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequest) {

TestDelegate request_delegate;

URLRequest url_request(GURL("ftp://ftp.example.com/"),

+ DEFAULT_PRIORITY,

&request_delegate,

request_context(),

network_delegate());

@@ -287,6 +293,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestOrphanJob) {

TestDelegate request_delegate;

URLRequest url_request(GURL("ftp://ftp.example.com/"),

+ DEFAULT_PRIORITY,

&request_delegate,

request_context(),

network_delegate());

@@ -315,6 +322,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedProxyAuthNoCredentials) {

TestDelegate request_delegate;

URLRequest url_request(GURL("ftp://ftp.example.com/"),

+ DEFAULT_PRIORITY,

&request_delegate,

request_context(),

network_delegate());

@@ -359,6 +367,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedProxyAuthWithCredentials) {

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());

@@ -392,6 +401,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedServerAuthNoCredentials) {

TestDelegate request_delegate;

URLRequest url_request(GURL("ftp://ftp.example.com/"),

+ DEFAULT_PRIORITY,

&request_delegate,

request_context(),

network_delegate());

@@ -436,6 +446,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedServerAuthWithCredentials) {

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());

@@ -502,6 +513,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedProxyAndServerAuth) {

request_delegate.set_credentials(

AuthCredentials(ASCIIToUTF16("proxyuser"), ASCIIToUTF16("proxypass")));

URLRequest url_request(url,

+ DEFAULT_PRIORITY,

&request_delegate,

request_context(),

network_delegate());

@@ -537,6 +549,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestDoNotSaveCookies) {

TestDelegate request_delegate;

URLRequest url_request(GURL("ftp://ftp.example.com/"),

+ DEFAULT_PRIORITY,

&request_delegate,

request_context(),

network_delegate());

@@ -571,6 +584,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestDoNotFollowRedirects) {

TestDelegate request_delegate;

URLRequest url_request(GURL("ftp://ftp.example.com/"),

+ DEFAULT_PRIORITY,

&request_delegate,

request_context(),

network_delegate());

@@ -615,6 +629,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestReuseSocket) {

TestDelegate request_delegate1;

URLRequest url_request1(GURL("ftp://ftp.example.com/first"),

+ DEFAULT_PRIORITY,

&request_delegate1,

request_context(),

network_delegate());

@@ -630,6 +645,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestReuseSocket) {

TestDelegate request_delegate2;

URLRequest url_request2(GURL("ftp://ftp.example.com/second"),

+ DEFAULT_PRIORITY,

&request_delegate2,

request_context(),

network_delegate());

@@ -676,6 +692,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestDoNotReuseSocket) {

TestDelegate request_delegate1;

URLRequest url_request1(GURL("ftp://ftp.example.com/first"),

+ DEFAULT_PRIORITY,

&request_delegate1,

request_context(),

network_delegate());

@@ -691,6 +708,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestDoNotReuseSocket) {

TestDelegate request_delegate2;

URLRequest url_request2(GURL("http://ftp.example.com/second"),

+ DEFAULT_PRIORITY,

&request_delegate2,

request_context(),

network_delegate());