diff options
author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 22:05:19 +0000 |
---|---|---|
committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 22:05:19 +0000 |
commit | 2ca01e54e2a4b4aa3996dc6a5eb83def3dd4cab1 (patch) | |
tree | 65eae8674a5f174856f79a2d14758b271aa33843 | |
parent | 93b7afd44a79bfdc4ce282cd6a848671b14762f9 (diff) | |
download | chromium_src-2ca01e54e2a4b4aa3996dc6a5eb83def3dd4cab1.zip chromium_src-2ca01e54e2a4b4aa3996dc6a5eb83def3dd4cab1.tar.gz chromium_src-2ca01e54e2a4b4aa3996dc6a5eb83def3dd4cab1.tar.bz2 |
[Net] Add a priority parameter to URLRequest's constructor
This is so that it is clearer what the intended initial priority of
a URLRequest is.
It is also needed so that we can later enforce that if a URLRequest
is set to ignore limits, it has MAXIMUM_PRIORITY; otherwise, we'd have
to mandate that SetPriority() is called before set_load_flags(), which
is fiddly.
Also standardize on a single URLRequest constructor.
BUG=166689
R=jam@chromium.org, jamesr@chromium.org, joth@chromium.org, mmenke@chromium.org, scottbyer@chromium.org, sky@chromium.org, tommi@chromium.org
Review URL: https://codereview.chromium.org/51953002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232219 0039d316-1c4b-4281-b951-d872f2087c98
65 files changed, 1059 insertions, 690 deletions
diff --git a/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc b/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc index 97a310ce..6954aa9 100644 --- a/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc +++ b/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc @@ -10,6 +10,7 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" +#include "net/base/request_priority.h" #include "net/url_request/url_request_job_factory_impl.h" #include "net/url_request/url_request_test_util.h" @@ -151,11 +152,10 @@ class AndroidStreamReaderURLRequestJobTest : public Test { virtual void SetUp() { context_.set_job_factory(&factory_); context_.set_network_delegate(&network_delegate_); - req_.reset( - new TestURLRequest(GURL("content://foo"), - &url_request_delegate_, - &context_, - &network_delegate_)); + req_.reset(new TestURLRequest(GURL("content://foo"), + net::DEFAULT_PRIORITY, + &url_request_delegate_, + &context_)); req_->set_method("GET"); } diff --git a/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc b/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc index c96ced0..fa02bc46 100644 --- a/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc @@ -20,6 +20,7 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "net/base/request_priority.h" #include "net/base/test_completion_callback.h" #include "net/http/http_byte_range.h" #include "net/url_request/url_request_test_util.h" @@ -183,9 +184,10 @@ class DriveURLRequestJobTest : public testing::Test { }; TEST_F(DriveURLRequestJobTest, NonGetMethod) { - net::URLRequest request( - GURL("drive:drive/root/File 1.txt"), test_delegate_.get(), - url_request_context_.get(), test_network_delegate_.get()); + net::URLRequest request(GURL("drive:drive/root/File 1.txt"), + net::DEFAULT_PRIORITY, + test_delegate_.get(), + url_request_context_.get()); request.set_method("POST"); // Set non "GET" method. request.Start(); @@ -201,9 +203,10 @@ TEST_F(DriveURLRequestJobTest, RegularFile) { // For the first time, the file should be fetched from the server. { - net::URLRequest request( - kTestUrl, test_delegate_.get(), - url_request_context_.get(), test_network_delegate_.get()); + net::URLRequest request(kTestUrl, + net::DEFAULT_PRIORITY, + test_delegate_.get(), + url_request_context_.get()); request.Start(); base::RunLoop().Run(); @@ -226,9 +229,10 @@ TEST_F(DriveURLRequestJobTest, RegularFile) { // The caching emulation is done by FakeFileSystem. { test_delegate_.reset(new TestDelegate); - net::URLRequest request( - GURL("drive:drive/root/File 1.txt"), test_delegate_.get(), - url_request_context_.get(), test_network_delegate_.get()); + net::URLRequest request(GURL("drive:drive/root/File 1.txt"), + net::DEFAULT_PRIORITY, + test_delegate_.get(), + url_request_context_.get()); request.Start(); base::RunLoop().Run(); @@ -249,8 +253,9 @@ TEST_F(DriveURLRequestJobTest, HostedDocument) { test_delegate_->set_quit_on_redirect(true); net::URLRequest request( GURL("drive:drive/root/Document 1 excludeDir-test.gdoc"), + net::DEFAULT_PRIORITY, test_delegate_.get(), - url_request_context_.get(), test_network_delegate_.get()); + url_request_context_.get()); request.Start(); base::RunLoop().Run(); @@ -263,9 +268,10 @@ TEST_F(DriveURLRequestJobTest, HostedDocument) { } TEST_F(DriveURLRequestJobTest, RootDirectory) { - net::URLRequest request( - GURL("drive:drive/root"), test_delegate_.get(), - url_request_context_.get(), test_network_delegate_.get()); + net::URLRequest request(GURL("drive:drive/root"), + net::DEFAULT_PRIORITY, + test_delegate_.get(), + url_request_context_.get()); request.Start(); base::RunLoop().Run(); @@ -275,9 +281,10 @@ TEST_F(DriveURLRequestJobTest, RootDirectory) { } TEST_F(DriveURLRequestJobTest, Directory) { - net::URLRequest request( - GURL("drive:drive/root/Directory 1"), test_delegate_.get(), - url_request_context_.get(), test_network_delegate_.get()); + net::URLRequest request(GURL("drive:drive/root/Directory 1"), + net::DEFAULT_PRIORITY, + test_delegate_.get(), + url_request_context_.get()); request.Start(); base::RunLoop().Run(); @@ -287,9 +294,10 @@ TEST_F(DriveURLRequestJobTest, Directory) { } TEST_F(DriveURLRequestJobTest, NonExistingFile) { - net::URLRequest request( - GURL("drive:drive/root/non-existing-file.txt"), test_delegate_.get(), - url_request_context_.get(), test_network_delegate_.get()); + net::URLRequest request(GURL("drive:drive/root/non-existing-file.txt"), + net::DEFAULT_PRIORITY, + test_delegate_.get(), + url_request_context_.get()); request.Start(); base::RunLoop().Run(); @@ -299,9 +307,10 @@ TEST_F(DriveURLRequestJobTest, NonExistingFile) { } TEST_F(DriveURLRequestJobTest, WrongFormat) { - net::URLRequest request( - GURL("drive:"), test_delegate_.get(), - url_request_context_.get(), test_network_delegate_.get()); + net::URLRequest request(GURL("drive:"), + net::DEFAULT_PRIORITY, + test_delegate_.get(), + url_request_context_.get()); request.Start(); base::RunLoop().Run(); @@ -311,9 +320,10 @@ TEST_F(DriveURLRequestJobTest, WrongFormat) { } TEST_F(DriveURLRequestJobTest, Cancel) { - net::URLRequest request( - GURL("drive:drive/root/File 1.txt"), test_delegate_.get(), - url_request_context_.get(), test_network_delegate_.get()); + net::URLRequest request(GURL("drive:drive/root/File 1.txt"), + net::DEFAULT_PRIORITY, + test_delegate_.get(), + url_request_context_.get()); // Start the request, and cancel it immediately after it. request.Start(); @@ -328,9 +338,10 @@ TEST_F(DriveURLRequestJobTest, RangeHeader) { const GURL kTestUrl("drive:drive/root/File 1.txt"); const base::FilePath kTestFilePath("drive/root/File 1.txt"); - net::URLRequest request( - kTestUrl, test_delegate_.get(), - url_request_context_.get(), test_network_delegate_.get()); + net::URLRequest request(kTestUrl, + net::DEFAULT_PRIORITY, + test_delegate_.get(), + url_request_context_.get()); // Set range header. request.SetExtraRequestHeaderByName( @@ -351,9 +362,10 @@ TEST_F(DriveURLRequestJobTest, RangeHeader) { TEST_F(DriveURLRequestJobTest, WrongRangeHeader) { const GURL kTestUrl("drive:drive/root/File 1.txt"); - net::URLRequest request( - kTestUrl, test_delegate_.get(), - url_request_context_.get(), test_network_delegate_.get()); + net::URLRequest request(kTestUrl, + net::DEFAULT_PRIORITY, + test_delegate_.get(), + url_request_context_.get()); // Set range header. request.SetExtraRequestHeaderByName( diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc index 75b24ac..468d634 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc @@ -21,6 +21,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_renderer_host.h" +#include "net/base/request_priority.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" #include "testing/gtest/include/gtest/gtest.h" @@ -34,11 +35,10 @@ void AssertInterceptedIO( net::URLRequestJobFactory* interceptor) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); net::URLRequestContext context; - net::NetworkDelegate *network_delegate = NULL; - net::URLRequest request(url, NULL, &context); + net::URLRequest request(url, net::DEFAULT_PRIORITY, NULL, &context); scoped_refptr<net::URLRequestJob> job = interceptor->MaybeCreateJobWithProtocolHandler( - url.scheme(), &request, network_delegate); + url.scheme(), &request, context.network_delegate()); ASSERT_TRUE(job.get() != NULL); } diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc index 0c4925fd..d54053b 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc @@ -23,6 +23,7 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_test_util.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "net/base/request_priority.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request_test_util.h" #include "testing/gmock/include/gmock/gmock.h" @@ -135,7 +136,8 @@ bool WebRequestActionWithThreadsTest::ActionWorksOnRequest( const std::string& extension_id, const WebRequestActionSet* action_set, RequestStage stage) { - net::TestURLRequest regular_request(GURL(url_string), NULL, &context_, NULL); + net::TestURLRequest regular_request( + GURL(url_string), net::DEFAULT_PRIORITY, NULL, &context_); std::list<LinkedPtrEventResponseDelta> deltas; scoped_refptr<net::HttpResponseHeaders> headers( new net::HttpResponseHeaders("")); diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc index 76c9cad..a15d034 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc @@ -11,6 +11,7 @@ #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.h" #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h" #include "content/public/browser/resource_request_info.h" +#include "net/base/request_priority.h" #include "net/test/spawned_test_server/spawned_test_server.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" @@ -89,14 +90,14 @@ TEST(WebRequestConditionAttributeTest, ResourceType) { net::TestURLRequestContext context; net::TestURLRequest url_request_ok( - GURL("http://www.example.com"), NULL, &context, NULL); + GURL("http://www.example.com"), net::DEFAULT_PRIORITY, NULL, &context); content::ResourceRequestInfo::AllocateForTesting( &url_request_ok, ResourceType::SUB_FRAME, NULL, -1, -1, false); EXPECT_TRUE(attribute->IsFulfilled(WebRequestData(&url_request_ok, ON_BEFORE_REQUEST))); net::TestURLRequest url_request_fail( - GURL("http://www.example.com"), NULL, &context, NULL); + GURL("http://www.example.com"), net::DEFAULT_PRIORITY, NULL, &context); content::ResourceRequestInfo::AllocateForTesting( &url_request_fail, ResourceType::MAIN_FRAME, NULL, -1, -1, false); EXPECT_FALSE(attribute->IsFulfilled(WebRequestData(&url_request_fail, @@ -119,8 +120,10 @@ TEST(WebRequestConditionAttributeTest, ContentType) { net::TestURLRequestContext context; net::TestDelegate delegate; - net::TestURLRequest url_request( - test_server.GetURL("files/headers.html"), &delegate, &context, NULL); + net::TestURLRequest url_request(test_server.GetURL("files/headers.html"), + net::DEFAULT_PRIORITY, + &delegate, + &context); url_request.Start(); base::MessageLoop::current()->Run(); @@ -203,7 +206,8 @@ TEST(WebRequestConditionAttributeTest, ThirdParty) { const GURL url_b("http://b.com"); net::TestURLRequestContext context; net::TestDelegate delegate; - net::TestURLRequest url_request(url_a, &delegate, &context, NULL); + net::TestURLRequest url_request( + url_a, net::DEFAULT_PRIORITY, &delegate, &context); for (unsigned int i = 1; i <= kLastActiveStage; i <<= 1) { if (!(kActiveStages & i)) @@ -293,7 +297,8 @@ TEST(WebRequestConditionAttributeTest, Stages) { const GURL url_empty; net::TestURLRequestContext context; net::TestDelegate delegate; - net::TestURLRequest url_request(url_empty, &delegate, &context, NULL); + net::TestURLRequest url_request( + url_empty, net::DEFAULT_PRIORITY, &delegate, &context); for (size_t i = 0; i < arraysize(active_stages); ++i) { EXPECT_FALSE(empty_attribute->IsFulfilled( @@ -417,7 +422,9 @@ TEST(WebRequestConditionAttributeTest, RequestHeaders) { net::TestURLRequestContext context; net::TestDelegate delegate; net::TestURLRequest url_request(GURL("http://example.com"), // Dummy URL. - &delegate, &context, NULL); + net::DEFAULT_PRIORITY, + &delegate, + &context); url_request.SetExtraRequestHeaderByName( "Custom-header", "custom/value", true /* overwrite */); url_request.Start(); @@ -502,7 +509,9 @@ TEST(WebRequestConditionAttributeTest, ResponseHeaders) { net::TestURLRequestContext context; net::TestDelegate delegate; net::TestURLRequest url_request(test_server.GetURL("files/headers.html"), - &delegate, &context, NULL); + net::DEFAULT_PRIORITY, + &delegate, + &context); url_request.Start(); base::MessageLoop::current()->Run(); diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc index d30d1a6..38552ad 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc @@ -12,6 +12,7 @@ #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h" #include "content/public/browser/resource_request_info.h" #include "extensions/common/matcher/url_matcher_constants.h" +#include "net/base/request_priority.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" @@ -76,7 +77,8 @@ TEST(WebRequestConditionTest, CreateCondition) { net::TestURLRequestContext context; const GURL http_url("http://www.example.com"); - net::TestURLRequest match_request(http_url, NULL, &context, NULL); + net::TestURLRequest match_request( + http_url, net::DEFAULT_PRIORITY, NULL, &context); WebRequestData data(&match_request, ON_BEFORE_REQUEST); WebRequestDataWithMatchIds request_data(&data); request_data.url_match_ids = matcher.MatchURL(http_url); @@ -86,7 +88,8 @@ TEST(WebRequestConditionTest, CreateCondition) { EXPECT_TRUE(result->IsFulfilled(request_data)); const GURL https_url("https://www.example.com"); - net::TestURLRequest wrong_resource_type(https_url, NULL, &context, NULL); + net::TestURLRequest wrong_resource_type( + https_url, net::DEFAULT_PRIORITY, NULL, &context); data.request = &wrong_resource_type; request_data.url_match_ids = matcher.MatchURL(http_url); // Make sure IsFulfilled does not fail because of URL matching. @@ -123,7 +126,8 @@ TEST(WebRequestConditionTest, CreateConditionFirstPartyForCookies) { net::TestURLRequestContext context; const GURL http_url("http://www.example.com"); const GURL first_party_url("http://fpfc.example.com"); - net::TestURLRequest match_request(http_url, NULL, &context, NULL); + net::TestURLRequest match_request( + http_url, net::DEFAULT_PRIORITY, NULL, &context); WebRequestData data(&match_request, ON_BEFORE_REQUEST); WebRequestDataWithMatchIds request_data(&data); request_data.url_match_ids = matcher.MatchURL(http_url); @@ -196,7 +200,7 @@ TEST(WebRequestConditionTest, NoUrlAttributes) { net::TestURLRequestContext context; net::TestURLRequest https_request( - GURL("https://www.example.com"), NULL, &context, NULL); + GURL("https://www.example.com"), net::DEFAULT_PRIORITY, NULL, &context); // 1. A non-empty condition without UrlFilter attributes is fulfilled iff its // attributes are fulfilled. @@ -255,7 +259,8 @@ TEST(WebRequestConditionTest, CreateConditionSet) { // https://www.example.com GURL http_url("http://www.example.com"); net::TestURLRequestContext context; - net::TestURLRequest http_request(http_url, NULL, &context, NULL); + net::TestURLRequest http_request( + http_url, net::DEFAULT_PRIORITY, NULL, &context); WebRequestData data(&http_request, ON_BEFORE_REQUEST); WebRequestDataWithMatchIds request_data(&data); request_data.url_match_ids = matcher.MatchURL(http_url); @@ -266,7 +271,8 @@ TEST(WebRequestConditionTest, CreateConditionSet) { GURL https_url("https://www.example.com"); request_data.url_match_ids = matcher.MatchURL(https_url); EXPECT_EQ(1u, request_data.url_match_ids.size()); - net::TestURLRequest https_request(https_url, NULL, &context, NULL); + net::TestURLRequest https_request( + https_url, net::DEFAULT_PRIORITY, NULL, &context); data.request = &https_request; EXPECT_TRUE(result->IsFulfilled(*(request_data.url_match_ids.begin()), request_data)); @@ -275,7 +281,8 @@ TEST(WebRequestConditionTest, CreateConditionSet) { GURL https_foo_url("https://foo.example.com"); request_data.url_match_ids = matcher.MatchURL(https_foo_url); EXPECT_EQ(0u, request_data.url_match_ids.size()); - net::TestURLRequest https_foo_request(https_foo_url, NULL, &context, NULL); + net::TestURLRequest https_foo_request( + https_foo_url, net::DEFAULT_PRIORITY, NULL, &context); data.request = &https_foo_request; EXPECT_FALSE(result->IsFulfilled(-1, request_data)); } @@ -313,22 +320,26 @@ TEST(WebRequestConditionTest, TestPortFilter) { // Test various URLs. GURL http_url("http://www.example.com"); net::TestURLRequestContext context; - net::TestURLRequest http_request(http_url, NULL, &context, NULL); + net::TestURLRequest http_request( + http_url, net::DEFAULT_PRIORITY, NULL, &context); url_match_ids = matcher.MatchURL(http_url); ASSERT_EQ(1u, url_match_ids.size()); GURL http_url_80("http://www.example.com:80"); - net::TestURLRequest http_request_80(http_url_80, NULL, &context, NULL); + net::TestURLRequest http_request_80( + http_url_80, net::DEFAULT_PRIORITY, NULL, &context); url_match_ids = matcher.MatchURL(http_url_80); ASSERT_EQ(1u, url_match_ids.size()); GURL http_url_1000("http://www.example.com:1000"); - net::TestURLRequest http_request_1000(http_url_1000, NULL, &context, NULL); + net::TestURLRequest http_request_1000( + http_url_1000, net::DEFAULT_PRIORITY, NULL, &context); url_match_ids = matcher.MatchURL(http_url_1000); ASSERT_EQ(1u, url_match_ids.size()); GURL http_url_2000("http://www.example.com:2000"); - net::TestURLRequest http_request_2000(http_url_2000, NULL, &context, NULL); + net::TestURLRequest http_request_2000( + http_url_2000, net::DEFAULT_PRIORITY, NULL, &context); url_match_ids = matcher.MatchURL(http_url_2000); ASSERT_EQ(0u, url_match_ids.size()); } diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc index 29f7791..a7997f4 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc @@ -19,6 +19,7 @@ #include "chrome/common/extensions/extension_test_util.h" #include "content/public/test/test_browser_thread.h" #include "extensions/common/matcher/url_matcher_constants.h" +#include "net/base/request_priority.h" #include "net/url_request/url_request_test_util.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest-message.h" @@ -277,7 +278,8 @@ TEST_F(WebRequestRulesRegistryTest, AddRulesImpl) { GURL http_url("http://www.example.com"); net::TestURLRequestContext context; - net::TestURLRequest http_request(http_url, NULL, &context, NULL); + net::TestURLRequest http_request( + http_url, net::DEFAULT_PRIORITY, NULL, &context); WebRequestData request_data(&http_request, ON_BEFORE_REQUEST); matches = registry->GetMatches(request_data); EXPECT_EQ(2u, matches.size()); @@ -290,7 +292,8 @@ TEST_F(WebRequestRulesRegistryTest, AddRulesImpl) { EXPECT_TRUE(ContainsKey(matches_ids, std::make_pair(kExtensionId, kRuleId2))); GURL foobar_url("http://www.foobar.com"); - net::TestURLRequest foobar_request(foobar_url, NULL, &context, NULL); + net::TestURLRequest foobar_request( + foobar_url, net::DEFAULT_PRIORITY, NULL, &context); request_data.request = &foobar_request; matches = registry->GetMatches(request_data); EXPECT_EQ(1u, matches.size()); @@ -416,7 +419,7 @@ TEST_F(WebRequestRulesRegistryTest, Precedences) { GURL url("http://www.google.com"); net::TestURLRequestContext context; - net::TestURLRequest request(url, NULL, &context, NULL); + net::TestURLRequest request(url, net::DEFAULT_PRIORITY, NULL, &context); WebRequestData request_data(&request, ON_BEFORE_REQUEST); std::list<LinkedPtrEventResponseDelta> deltas = registry->CreateDeltas(NULL, request_data, false); @@ -464,7 +467,7 @@ TEST_F(WebRequestRulesRegistryTest, Priorities) { GURL url("http://www.google.com/index.html"); net::TestURLRequestContext context; - net::TestURLRequest request(url, NULL, &context, NULL); + net::TestURLRequest request(url, net::DEFAULT_PRIORITY, NULL, &context); WebRequestData request_data(&request, ON_BEFORE_REQUEST); std::list<LinkedPtrEventResponseDelta> deltas = registry->CreateDeltas(NULL, request_data, false); @@ -537,7 +540,7 @@ TEST_F(WebRequestRulesRegistryTest, IgnoreRulesByTag) { GURL url("http://www.foo.com/test"); net::TestURLRequestContext context; - net::TestURLRequest request(url, NULL, &context, NULL); + net::TestURLRequest request(url, net::DEFAULT_PRIORITY, NULL, &context); WebRequestData request_data(&request, ON_BEFORE_REQUEST); std::list<LinkedPtrEventResponseDelta> deltas = registry->CreateDeltas(NULL, request_data, false); @@ -586,7 +589,8 @@ TEST_F(WebRequestRulesRegistryTest, GetMatchesCheckFulfilled) { GURL http_url("http://www.example.com"); net::TestURLRequestContext context; - net::TestURLRequest http_request(http_url, NULL, &context, NULL); + net::TestURLRequest http_request( + http_url, net::DEFAULT_PRIORITY, NULL, &context); WebRequestData request_data(&http_request, ON_BEFORE_REQUEST); matches = registry->GetMatches(request_data); EXPECT_EQ(1u, matches.size()); @@ -642,7 +646,8 @@ TEST_F(WebRequestRulesRegistryTest, GetMatchesDifferentUrls) { for (size_t i = 0; i < arraysize(matchingRuleIds); ++i) { // Construct the inputs. - net::TestURLRequest http_request(urls[i], NULL, &context, NULL); + net::TestURLRequest http_request( + urls[i], net::DEFAULT_PRIORITY, NULL, &context); WebRequestData request_data(&http_request, ON_BEFORE_REQUEST); http_request.set_first_party_for_cookies(firstPartyUrls[i]); // Now run both rules on the input. @@ -788,14 +793,14 @@ TEST_F(WebRequestRulesRegistryTest, CheckOriginAndPathRegEx) { // No match because match is in the query parameter. GURL url1("http://bar.com/index.html?foo.com"); - net::TestURLRequest request1(url1, NULL, &context, NULL); + net::TestURLRequest request1(url1, net::DEFAULT_PRIORITY, NULL, &context); WebRequestData request_data1(&request1, ON_BEFORE_REQUEST); deltas = registry->CreateDeltas(NULL, request_data1, false); EXPECT_EQ(0u, deltas.size()); // This is a correct match. GURL url2("http://foo.com/index.html"); - net::TestURLRequest request2(url2, NULL, &context, NULL); + net::TestURLRequest request2(url2, net::DEFAULT_PRIORITY, NULL, &context); WebRequestData request_data2(&request2, ON_BEFORE_REQUEST); deltas = registry->CreateDeltas(NULL, request_data2, false); EXPECT_EQ(1u, deltas.size()); diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc index c98ceea..b563564 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc @@ -42,6 +42,7 @@ #include "net/base/auth.h" #include "net/base/capturing_net_log.h" #include "net/base/net_util.h" +#include "net/base/request_priority.h" #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" #include "net/base/upload_file_element_reader.h" @@ -240,7 +241,8 @@ TEST_F(ExtensionWebRequestTest, BlockingEventPrecedenceRedirect) { GURL redirect_url("about:redirected"); GURL not_chosen_redirect_url("about:not_chosen"); - net::URLRequest request(GURL("about:blank"), &delegate_, context_.get()); + net::URLRequest request( + GURL("about:blank"), net::DEFAULT_PRIORITY, &delegate_, context_.get()); { // onBeforeRequest will be dispatched twice initially. The second response - // the redirect - should win, since it has a later |install_time|. The @@ -294,7 +296,8 @@ TEST_F(ExtensionWebRequestTest, BlockingEventPrecedenceRedirect) { } // Now test the same thing but the extensions answer in reverse order. - net::URLRequest request2(GURL("about:blank"), &delegate_, context_.get()); + net::URLRequest request2( + GURL("about:blank"), net::DEFAULT_PRIORITY, &delegate_, context_.get()); { ExtensionWebRequestEventRouter::EventResponse* response = NULL; @@ -367,7 +370,8 @@ TEST_F(ExtensionWebRequestTest, BlockingEventPrecedenceCancel) { ipc_sender_factory.GetWeakPtr()); GURL request_url("about:blank"); - net::URLRequest request(request_url, &delegate_, context_.get()); + net::URLRequest request( + request_url, net::DEFAULT_PRIORITY, &delegate_, context_.get()); // onBeforeRequest will be dispatched twice. The second response - // the redirect - would win, since it has a later |install_time|, but @@ -434,7 +438,8 @@ TEST_F(ExtensionWebRequestTest, SimulateChancelWhileBlocked) { filter, 0, -1, -1, ipc_sender_factory.GetWeakPtr()); GURL request_url("about:blank"); - net::URLRequest request(request_url, &delegate_, context_.get()); + net::URLRequest request( + request_url, net::DEFAULT_PRIORITY, &delegate_, context_.get()); ExtensionWebRequestEventRouter::EventResponse* response = NULL; @@ -497,7 +502,8 @@ void ExtensionWebRequestTest::FireURLRequestWithData( const std::vector<char>& bytes_2) { // The request URL can be arbitrary but must have an HTTP or HTTPS scheme. GURL request_url("http://www.example.com"); - net::URLRequest request(request_url, &delegate_, context_.get()); + net::URLRequest request( + request_url, net::DEFAULT_PRIORITY, &delegate_, context_.get()); request.set_method(method); if (content_type != NULL) request.SetExtraRequestHeaderByName(net::HttpRequestHeaders::kContentType, @@ -710,7 +716,8 @@ TEST_F(ExtensionWebRequestTest, NoAccessRequestBodyData) { const GURL request_url("http://www.example.com"); for (size_t i = 0; i < arraysize(kMethods); ++i) { - net::URLRequest request(request_url, &delegate_, context_.get()); + net::URLRequest request( + request_url, net::DEFAULT_PRIORITY, &delegate_, context_.get()); request.set_method(kMethods[i]); ipc_sender_.PushTask(base::Bind(&base::DoNothing)); request.Start(); @@ -829,7 +836,8 @@ TEST_P(ExtensionWebRequestHeaderModificationTest, TestModifications) { ipc_sender_factory.GetWeakPtr()); GURL request_url("http://doesnotexist/does_not_exist.html"); - net::URLRequest request(request_url, &delegate_, context_.get()); + net::URLRequest request( + request_url, net::DEFAULT_PRIORITY, &delegate_, context_.get()); // Initialize headers available before extensions are notified of the // onBeforeSendHeaders event. diff --git a/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc index e007317..a0eb5e7 100644 --- a/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc @@ -11,6 +11,7 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/browser/resource_request_info.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "net/base/request_priority.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" @@ -90,7 +91,8 @@ TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) { // Check that requests are rejected based on the destination for (size_t i = 0; i < arraysize(sensitive_urls); ++i) { GURL sensitive_url(sensitive_urls[i]); - net::TestURLRequest request(sensitive_url, NULL, &context, NULL); + net::TestURLRequest request( + sensitive_url, net::DEFAULT_PRIORITY, NULL, &context); EXPECT_TRUE( WebRequestPermissions::HideRequest(extension_info_map_.get(), &request)) << sensitive_urls[i]; @@ -98,7 +100,8 @@ TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) { // Check that requests are accepted if they don't touch sensitive urls. for (size_t i = 0; i < arraysize(non_sensitive_urls); ++i) { GURL non_sensitive_url(non_sensitive_urls[i]); - net::TestURLRequest request(non_sensitive_url, NULL, &context, NULL); + net::TestURLRequest request( + non_sensitive_url, net::DEFAULT_PRIORITY, NULL, &context); EXPECT_FALSE( WebRequestPermissions::HideRequest(extension_info_map_.get(), &request)) << non_sensitive_urls[i]; @@ -109,7 +112,7 @@ TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) { // Normally this request is not protected: GURL non_sensitive_url("http://www.google.com/test.js"); net::TestURLRequest non_sensitive_request( - non_sensitive_url, NULL, &context, NULL); + non_sensitive_url, net::DEFAULT_PRIORITY, NULL, &context); EXPECT_FALSE(WebRequestPermissions::HideRequest(extension_info_map_.get(), &non_sensitive_request)); // If the origin is labeled by the WebStoreAppId, it becomes protected. @@ -118,7 +121,7 @@ TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) { int site_instance_id = 23; int frame_id = 17; net::TestURLRequest sensitive_request( - non_sensitive_url, NULL, &context, NULL); + non_sensitive_url, net::DEFAULT_PRIORITY, NULL, &context); ResourceRequestInfo::AllocateForTesting( &sensitive_request, ResourceType::SCRIPT, NULL, process_id, frame_id, false); @@ -132,7 +135,7 @@ TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) { int process_id = kSigninProcessId; int frame_id = 19; net::TestURLRequest sensitive_request( - non_sensitive_url, NULL, &context, NULL); + non_sensitive_url, net::DEFAULT_PRIORITY, NULL, &context); ResourceRequestInfo::AllocateForTesting( &sensitive_request, ResourceType::SCRIPT, NULL, process_id, frame_id, false); @@ -144,7 +147,7 @@ TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) { TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestCanExtensionAccessURL_HostPermissions) { net::TestURLRequest request( - GURL("http://example.com"), NULL, &context, NULL); + GURL("http://example.com"), net::DEFAULT_PRIORITY, NULL, &context); EXPECT_TRUE(WebRequestPermissions::CanExtensionAccessURL( extension_info_map_.get(), diff --git a/chrome/browser/extensions/extension_protocols_unittest.cc b/chrome/browser/extensions/extension_protocols_unittest.cc index e323cd5..aff56cc 100644 --- a/chrome/browser/extensions/extension_protocols_unittest.cc +++ b/chrome/browser/extensions/extension_protocols_unittest.cc @@ -18,6 +18,7 @@ #include "content/public/test/mock_resource_context.h" #include "content/public/test/test_browser_thread_bundle.h" #include "extensions/common/constants.h" +#include "net/base/request_priority.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_job_factory_impl.h" #include "net/url_request/url_request_status.h" @@ -170,6 +171,7 @@ TEST_F(ExtensionProtocolTest, IncognitoRequest) { // is blocked, we should see ADDRESS_UNREACHABLE. Otherwise, the request // should just fail because the file doesn't exist. net::URLRequest request(extension->GetResourceURL("404.html"), + net::DEFAULT_PRIORITY, &test_delegate_, resource_context_.GetRequestContext()); StartRequest(&request, ResourceType::MAIN_FRAME); @@ -187,6 +189,7 @@ TEST_F(ExtensionProtocolTest, IncognitoRequest) { // Now do a subframe request. { net::URLRequest request(extension->GetResourceURL("404.html"), + net::DEFAULT_PRIORITY, &test_delegate_, resource_context_.GetRequestContext()); StartRequest(&request, ResourceType::SUB_FRAME); @@ -225,6 +228,7 @@ TEST_F(ExtensionProtocolTest, ComponentResourceRequest) { // First test it with the extension enabled. { net::URLRequest request(extension->GetResourceURL("webstore_icon_16.png"), + net::DEFAULT_PRIORITY, &test_delegate_, resource_context_.GetRequestContext()); StartRequest(&request, ResourceType::MEDIA); @@ -237,6 +241,7 @@ TEST_F(ExtensionProtocolTest, ComponentResourceRequest) { UnloadedExtensionInfo::REASON_DISABLE); { net::URLRequest request(extension->GetResourceURL("webstore_icon_16.png"), + net::DEFAULT_PRIORITY, &test_delegate_, resource_context_.GetRequestContext()); StartRequest(&request, ResourceType::MEDIA); @@ -256,6 +261,7 @@ TEST_F(ExtensionProtocolTest, ResourceRequestResponseHeaders) { { net::URLRequest request(extension->GetResourceURL("test.dat"), + net::DEFAULT_PRIORITY, &test_delegate_, resource_context_.GetRequestContext()); StartRequest(&request, ResourceType::MEDIA); diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc index dfc81dd..0e530d4 100644 --- a/chrome/browser/extensions/user_script_listener_unittest.cc +++ b/chrome/browser/extensions/user_script_listener_unittest.cc @@ -16,6 +16,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/resource_controller.h" #include "content/public/browser/resource_throttle.h" +#include "net/base/request_priority.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_filter.h" #include "net/url_request/url_request_test_job.h" @@ -160,7 +161,7 @@ class UserScriptListenerTest : public ExtensionServiceTestBase { net::TestURLRequestContext* context) { GURL url(url_string); net::TestURLRequest* request = - new net::TestURLRequest(url, delegate, context, NULL); + new net::TestURLRequest(url, net::DEFAULT_PRIORITY, delegate, context); ResourceThrottle* throttle = listener_->CreateResourceThrottle(url, ResourceType::MAIN_FRAME); @@ -326,7 +327,7 @@ TEST_F(UserScriptListenerTest, ResumeBeforeStart) { net::TestURLRequestContext context; GURL url(kMatchingUrl); scoped_ptr<net::TestURLRequest> request( - new net::TestURLRequest(url, &delegate, &context, NULL)); + new net::TestURLRequest(url, net::DEFAULT_PRIORITY, &delegate, &context)); ResourceThrottle* throttle = listener_->CreateResourceThrottle(url, ResourceType::MAIN_FRAME); diff --git a/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc b/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc index 89e8b48..19775ff 100644 --- a/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc +++ b/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc @@ -12,6 +12,7 @@ #include "base/time/time.h" #include "chrome/browser/net/cert_logger.pb.h" #include "net/base/load_flags.h" +#include "net/base/request_priority.h" #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" #include "net/cert/x509_certificate.h" @@ -55,12 +56,14 @@ static std::string BuildReport(const std::string& hostname, return out; } -net::URLRequest* ChromeFraudulentCertificateReporter::CreateURLRequest( - net::URLRequestContext* context) { - net::URLRequest* request = context->CreateRequest(upload_url_, this); +scoped_ptr<net::URLRequest> +ChromeFraudulentCertificateReporter::CreateURLRequest( + net::URLRequestContext* context) { + scoped_ptr<net::URLRequest> request = + context->CreateRequest(upload_url_, net::DEFAULT_PRIORITY, this); request->set_load_flags(net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES); - return request; + return request.Pass(); } void ChromeFraudulentCertificateReporter::SendReport( @@ -76,7 +79,7 @@ void ChromeFraudulentCertificateReporter::SendReport( std::string report = BuildReport(hostname, ssl_info); - net::URLRequest* url_request = CreateURLRequest(request_context_); + scoped_ptr<net::URLRequest> url_request = CreateURLRequest(request_context_); url_request->set_method("POST"); scoped_ptr<net::UploadElementReader> reader( @@ -89,15 +92,16 @@ void ChromeFraudulentCertificateReporter::SendReport( "x-application/chrome-fraudulent-cert-report"); url_request->SetExtraRequestHeaders(headers); - inflight_requests_.insert(url_request); - url_request->Start(); + net::URLRequest* raw_url_request = url_request.get(); + inflight_requests_.insert(url_request.release()); + raw_url_request->Start(); } void ChromeFraudulentCertificateReporter::RequestComplete( net::URLRequest* request) { std::set<net::URLRequest*>::iterator i = inflight_requests_.find(request); DCHECK(i != inflight_requests_.end()); - delete *i; + scoped_ptr<net::URLRequest> url_request(*i); inflight_requests_.erase(i); } diff --git a/chrome/browser/net/chrome_fraudulent_certificate_reporter.h b/chrome/browser/net/chrome_fraudulent_certificate_reporter.h index 3237972..1b1e275 100644 --- a/chrome/browser/net/chrome_fraudulent_certificate_reporter.h +++ b/chrome/browser/net/chrome_fraudulent_certificate_reporter.h @@ -28,7 +28,8 @@ class ChromeFraudulentCertificateReporter // Allows users of this class to override this and set their own URLRequest // type. Used by SendReport. - virtual net::URLRequest* CreateURLRequest(net::URLRequestContext* context); + virtual scoped_ptr<net::URLRequest> CreateURLRequest( + net::URLRequestContext* context); // net::FraudulentCertificateReporter virtual void SendReport(const std::string& hostname, @@ -48,6 +49,7 @@ class ChromeFraudulentCertificateReporter void RequestComplete(net::URLRequest* request); const GURL upload_url_; + // Owns the contained requests. std::set<net::URLRequest*> inflight_requests_; DISALLOW_COPY_AND_ASSIGN(ChromeFraudulentCertificateReporter); diff --git a/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc b/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc index cf8a8c5..00a21d3 100644 --- a/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc +++ b/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc @@ -14,6 +14,7 @@ #include "base/threading/thread.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "content/public/test/test_browser_thread.h" +#include "net/base/request_priority.h" #include "net/base/test_data_directory.h" #include "net/cert/x509_certificate.h" #include "net/http/transport_security_state.h" @@ -123,7 +124,10 @@ class NotSendingTestReporter : public TestReporter { class MockURLRequest : public net::URLRequest { public: explicit MockURLRequest(net::URLRequestContext* context) - : net::URLRequest(GURL(std::string()), NULL, context) {} + : net::URLRequest(GURL(std::string()), + net::DEFAULT_PRIORITY, + NULL, + context) {} private: }; @@ -135,9 +139,9 @@ class MockReporter : public ChromeFraudulentCertificateReporter { explicit MockReporter(net::URLRequestContext* request_context) : ChromeFraudulentCertificateReporter(request_context) {} - virtual net::URLRequest* CreateURLRequest( + virtual scoped_ptr<net::URLRequest> CreateURLRequest( net::URLRequestContext* context) OVERRIDE { - return new MockURLRequest(context); + return scoped_ptr<net::URLRequest>(new MockURLRequest(context)); } virtual void SendReport( diff --git a/chrome/browser/net/chrome_network_delegate_unittest.cc b/chrome/browser/net/chrome_network_delegate_unittest.cc index 831e674..75144be 100644 --- a/chrome/browser/net/chrome_network_delegate_unittest.cc +++ b/chrome/browser/net/chrome_network_delegate_unittest.cc @@ -16,6 +16,7 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread_bundle.h" #include "net/base/completion_callback.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" @@ -48,11 +49,11 @@ class ChromeNetworkDelegateTest : public testing::Test { net::TestURLRequestContext context; net::TestURLRequest extension_request( - GURL("http://example.com/"), NULL, &context, NULL); + GURL("http://example.com/"), net::DEFAULT_PRIORITY, NULL, &context); extension_request.set_first_party_for_cookies( GURL("chrome-extension://abcdef/bingo.html")); net::TestURLRequest web_page_request( - GURL("http://example.com/"), NULL, &context, NULL); + GURL("http://example.com/"), net::DEFAULT_PRIORITY, NULL, &context); web_page_request.set_first_party_for_cookies( GURL("http://example.com/helloworld.html")); @@ -127,7 +128,7 @@ class ChromeNetworkDelegateSafeSearchTest : public testing::Test { SCOPED_TRACE(url_string); net::TestURLRequest request( - GURL(url_string), &delegate_, &context_, network_delegate_); + GURL(url_string), net::DEFAULT_PRIORITY, &delegate_, &context_); request.Start(); base::MessageLoop::current()->RunUntilIdle(); diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc index 7a06aae..0d38a6c 100644 --- a/chrome/browser/net/connection_tester.cc +++ b/chrome/browser/net/connection_tester.cc @@ -18,6 +18,7 @@ #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" +#include "net/base/request_priority.h" #include "net/cert/cert_verifier.h" #include "net/cookies/cookie_monster.h" #include "net/dns/host_resolver.h" @@ -409,7 +410,8 @@ void ConnectionTester::TestRunner::ProxyConfigServiceCreated( return; } // Fetch a request using the experimental context. - request_.reset(request_context_->CreateRequest(experiment.url, this)); + request_ = request_context_->CreateRequest( + experiment.url, net::DEFAULT_PRIORITY, this); request_->Start(); } diff --git a/chrome/browser/net/http_pipelining_compatibility_client.cc b/chrome/browser/net/http_pipelining_compatibility_client.cc index e90fb03..75ef89d 100644 --- a/chrome/browser/net/http_pipelining_compatibility_client.cc +++ b/chrome/browser/net/http_pipelining_compatibility_client.cc @@ -14,6 +14,7 @@ #include "content/public/browser/browser_thread.h" #include "net/base/load_flags.h" #include "net/base/network_change_notifier.h" +#include "net/base/request_priority.h" #include "net/disk_cache/histogram_macros.h" #include "net/http/http_network_layer.h" #include "net/http/http_network_session.h" @@ -89,8 +90,10 @@ Request::Request(int request_id, net::URLRequestContext* url_request_context) : delegate_(delegate), request_id_(request_id), - url_request_(url_request_context->CreateRequest( - GURL(base_url + info.filename), this)), + url_request_(url_request_context->CreateRequest(GURL(base_url + + info.filename), + net::DEFAULT_PRIORITY, + this)), info_(info), response_code_(0) { url_request_->set_load_flags(net::LOAD_BYPASS_CACHE | diff --git a/chrome/browser/plugins/plugin_installer.cc b/chrome/browser/plugins/plugin_installer.cc index 6801d13..d9f4546 100644 --- a/chrome/browser/plugins/plugin_installer.cc +++ b/chrome/browser/plugins/plugin_installer.cc @@ -24,6 +24,7 @@ #include "content/public/browser/resource_dispatcher_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/referrer.h" +#include "net/base/request_priority.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" @@ -44,7 +45,8 @@ void BeginDownload( ResourceDispatcherHost* rdh = ResourceDispatcherHost::Get(); scoped_ptr<net::URLRequest> request( - resource_context->GetRequestContext()->CreateRequest(url, NULL)); + resource_context->GetRequestContext()->CreateRequest( + url, net::DEFAULT_PRIORITY, NULL)); net::Error error = rdh->BeginDownload( request.Pass(), content::Referrer(), diff --git a/chrome/browser/policy/url_blacklist_manager_unittest.cc b/chrome/browser/policy/url_blacklist_manager_unittest.cc index 9d71608..2f782a9 100644 --- a/chrome/browser/policy/url_blacklist_manager_unittest.cc +++ b/chrome/browser/policy/url_blacklist_manager_unittest.cc @@ -13,6 +13,7 @@ #include "chrome/common/pref_names.h" #include "content/public/test/test_browser_thread.h" #include "google_apis/gaia/gaia_urls.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" @@ -496,7 +497,8 @@ TEST_F(URLBlacklistManagerTest, DontBlockResources) { EXPECT_TRUE(blacklist_manager_->IsURLBlocked(GURL("http://google.com"))); net::TestURLRequestContext context; - net::URLRequest request(GURL("http://google.com"), NULL, &context); + net::URLRequest request( + GURL("http://google.com"), net::DEFAULT_PRIORITY, NULL, &context); // Background requests aren't filtered. EXPECT_FALSE(blacklist_manager_->IsRequestBlocked(request)); @@ -515,7 +517,7 @@ TEST_F(URLBlacklistManagerTest, DontBlockResources) { GURL sync_url(GaiaUrls::GetInstance()->service_login_url().Resolve( "?service=chromiumsync")); - net::URLRequest sync_request(sync_url, NULL, &context); + net::URLRequest sync_request(sync_url, net::DEFAULT_PRIORITY, NULL, &context); sync_request.set_load_flags(net::LOAD_MAIN_FRAME); EXPECT_EQ(block_signin_urls, blacklist_manager_->IsRequestBlocked(sync_request)); diff --git a/chrome/browser/predictors/resource_prefetcher.cc b/chrome/browser/predictors/resource_prefetcher.cc index 9acbe08..0a1a65b 100644 --- a/chrome/browser/predictors/resource_prefetcher.cc +++ b/chrome/browser/predictors/resource_prefetcher.cc @@ -9,6 +9,8 @@ #include "base/stl_util.h" #include "content/public/browser/browser_thread.h" #include "net/base/io_buffer.h" +#include "net/base/request_priority.h" +#include "net/url_request/url_request_context.h" namespace { @@ -121,17 +123,14 @@ void ResourcePrefetcher::TryToLaunchPrefetchRequests() { void ResourcePrefetcher::SendRequest(Request* request) { request->prefetch_status = Request::PREFETCH_STATUS_STARTED; - net::URLRequest* url_request = - new net::URLRequest(request->resource_url, - this, - delegate_->GetURLRequestContext()); + net::URLRequest* url_request = new net::URLRequest( + request->resource_url, net::LOW, this, delegate_->GetURLRequestContext()); inflight_requests_[url_request] = request; host_inflight_counts_[url_request->original_url().host()] += 1; url_request->set_method("GET"); url_request->set_first_party_for_cookies(navigation_id_.main_frame_url); url_request->SetReferrer(navigation_id_.main_frame_url.spec()); - url_request->SetPriority(net::LOW); StartURLRequest(url_request); } diff --git a/chrome/browser/prerender/prerender_tracker_unittest.cc b/chrome/browser/prerender/prerender_tracker_unittest.cc index 2ee44da..b96159a 100644 --- a/chrome/browser/prerender/prerender_tracker_unittest.cc +++ b/chrome/browser/prerender/prerender_tracker_unittest.cc @@ -20,6 +20,7 @@ #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" @@ -527,9 +528,10 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectResume) { 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); content::ResourceRequestInfo::AllocateForTesting( &request, ResourceType::IMAGE, NULL, kDefaultChildId, kDefaultRouteId, true); @@ -566,9 +568,10 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectCancel) { 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); content::ResourceRequestInfo::AllocateForTesting( &request, ResourceType::IMAGE, NULL, kDefaultChildId, kDefaultRouteId, true); @@ -605,9 +608,10 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectMainFrame) { 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); content::ResourceRequestInfo::AllocateForTesting( &request, ResourceType::MAIN_FRAME, NULL, kDefaultChildId, kDefaultRouteId, true); @@ -643,9 +647,10 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectSyncXHR) { 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); content::ResourceRequestInfo::AllocateForTesting( &request, ResourceType::XHR, NULL, kDefaultChildId, kDefaultRouteId, false); diff --git a/chrome/browser/search/iframe_source_unittest.cc b/chrome/browser/search/iframe_source_unittest.cc index 252a8cd..7df025d 100644 --- a/chrome/browser/search/iframe_source_unittest.cc +++ b/chrome/browser/search/iframe_source_unittest.cc @@ -14,6 +14,7 @@ #include "content/public/test/mock_resource_context.h" #include "content/public/test/test_browser_thread_bundle.h" #include "grit/browser_resources.h" +#include "net/base/request_priority.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_test_util.h" @@ -96,7 +97,9 @@ class IframeSourceTest : public testing::Test { int render_process_id, int render_view_id) { net::URLRequest* request = - new net::URLRequest(GURL(url), NULL, + new net::URLRequest(GURL(url), + net::DEFAULT_PRIORITY, + NULL, resource_context_.GetRequestContext()); if (allocate_info) { content::ResourceRequestInfo::AllocateForTesting(request, diff --git a/chrome/browser/ssl/ssl_client_certificate_selector_test.cc b/chrome/browser/ssl/ssl_client_certificate_selector_test.cc index da8e463..429980b 100644 --- a/chrome/browser/ssl/ssl_client_certificate_selector_test.cc +++ b/chrome/browser/ssl/ssl_client_certificate_selector_test.cc @@ -12,6 +12,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "net/base/request_priority.h" #include "net/base/test_data_directory.h" #include "net/cert/x509_certificate.h" #include "net/http/http_transaction_factory.h" @@ -78,7 +79,7 @@ void SSLClientCertificateSelectorTestBase::CleanUpOnMainThread() { } void SSLClientCertificateSelectorTestBase::SetUpOnIOThread() { - url_request_ = MakeURLRequest(url_request_context_getter_.get()); + url_request_ = MakeURLRequest(url_request_context_getter_.get()).release(); auth_requestor_ = new StrictMock<SSLClientAuthRequestorMock>( url_request_, cert_request_info_.get()); @@ -92,10 +93,11 @@ void SSLClientCertificateSelectorTestBase::CleanUpOnIOThread() { io_loop_finished_event_.Signal(); } -net::URLRequest* SSLClientCertificateSelectorTestBase::MakeURLRequest( +scoped_ptr<net::URLRequest> +SSLClientCertificateSelectorTestBase::MakeURLRequest( net::URLRequestContextGetter* context_getter) { - net::URLRequest* request = + scoped_ptr<net::URLRequest> request = context_getter->GetURLRequestContext()->CreateRequest( - GURL("https://example"), NULL); - return request; + GURL("https://example"), net::DEFAULT_PRIORITY, NULL); + return request.Pass(); } diff --git a/chrome/browser/ssl/ssl_client_certificate_selector_test.h b/chrome/browser/ssl/ssl_client_certificate_selector_test.h index f0931db..a95ddac 100644 --- a/chrome/browser/ssl/ssl_client_certificate_selector_test.h +++ b/chrome/browser/ssl/ssl_client_certificate_selector_test.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_SSL_SSL_CLIENT_CERTIFICATE_SELECTOR_TEST_H_ #define CHROME_BROWSER_SSL_SSL_CLIENT_CERTIFICATE_SELECTOR_TEST_H_ +#include "base/memory/scoped_ptr.h" #include "base/synchronization/waitable_event.h" #include "chrome/browser/ssl/ssl_client_auth_requestor_mock.h" #include "chrome/test/base/in_process_browser_test.h" @@ -28,7 +29,7 @@ class SSLClientCertificateSelectorTestBase : public InProcessBrowserTest { virtual void CleanUpOnIOThread(); protected: - net::URLRequest* MakeURLRequest( + scoped_ptr<net::URLRequest> MakeURLRequest( net::URLRequestContextGetter* context_getter); base::WaitableEvent io_loop_finished_event_; diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc index 7866f1b..77687f5 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc @@ -15,6 +15,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "net/base/request_priority.h" #include "net/base/test_data_directory.h" #include "net/cert/x509_certificate.h" #include "net/http/http_transaction_factory.h" @@ -81,7 +82,7 @@ class SSLClientCertificateSelectorTest : public InProcessBrowserTest { } virtual void SetUpOnIOThread() { - url_request_ = MakeURLRequest(url_request_context_getter_); + url_request_ = MakeURLRequest(url_request_context_getter_).release(); auth_requestor_ = new StrictMock<SSLClientAuthRequestorMock>( url_request_, @@ -109,12 +110,10 @@ class SSLClientCertificateSelectorTest : public InProcessBrowserTest { } protected: - net::URLRequest* MakeURLRequest( + scoped_ptr<net::URLRequest> MakeURLRequest( net::URLRequestContextGetter* context_getter) { - net::URLRequest* request = - context_getter->GetURLRequestContext()->CreateRequest( - GURL("https://example"), NULL); - return request; + return context_getter->GetURLRequestContext()->CreateRequest( + GURL("https://example"), net::DEFAULT_PRIORITY, NULL); } base::WaitableEvent io_loop_finished_event_; @@ -180,8 +179,8 @@ class SSLClientCertificateSelectorMultiTabTest } virtual void SetUpOnIOThread() OVERRIDE { - url_request_1_ = MakeURLRequest(url_request_context_getter_); - url_request_2_ = MakeURLRequest(url_request_context_getter_); + url_request_1_ = MakeURLRequest(url_request_context_getter_).release(); + url_request_2_ = MakeURLRequest(url_request_context_getter_).release(); auth_requestor_1_ = new StrictMock<SSLClientAuthRequestorMock>( url_request_1_, @@ -247,7 +246,7 @@ class SSLClientCertificateSelectorMultiProfileTest } virtual void SetUpOnIOThread() OVERRIDE { - url_request_1_ = MakeURLRequest(url_request_context_getter_1_); + url_request_1_ = MakeURLRequest(url_request_context_getter_1_).release(); auth_requestor_1_ = new StrictMock<SSLClientAuthRequestorMock>( url_request_1_, diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc index 74c8c97..92d8e0e 100644 --- a/chrome_frame/test/test_server_test.cc +++ b/chrome_frame/test/test_server_test.cc @@ -11,6 +11,7 @@ #include "base/strings/stringprintf.h" #include "base/win/scoped_handle.h" #include "chrome_frame/test/test_server.h" +#include "net/base/request_priority.h" #include "net/cookies/cookie_monster.h" #include "net/disk_cache/disk_cache.h" #include "net/dns/host_resolver_proc.h" @@ -64,10 +65,10 @@ class ScopedInternet { class TestURLRequest : public net::URLRequest { public: TestURLRequest(const GURL& url, + net::RequestPriority priority, Delegate* delegate, - net::TestURLRequestContext* context) - : net::URLRequest(url, delegate, context) { - } + const net::TestURLRequestContext* context) + : net::URLRequest(url, priority, delegate, context) {} }; class UrlTaskChain { @@ -82,7 +83,7 @@ class UrlTaskChain { base::MessageLoopForIO loop; net::TestURLRequestContext context; - TestURLRequest r(GURL(url_), &delegate_, &context); + TestURLRequest r(GURL(url_), net::DEFAULT_PRIORITY, &delegate_, &context); r.Start(); EXPECT_TRUE(r.is_pending()); diff --git a/cloud_print/service/service_state.cc b/cloud_print/service/service_state.cc index 68d3a89..fff7694 100644 --- a/cloud_print/service/service_state.cc +++ b/cloud_print/service/service_state.cc @@ -13,6 +13,7 @@ #include "net/base/escape.h" #include "net/base/io_buffer.h" #include "net/base/load_flags.h" +#include "net/base/request_priority.h" #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" #include "net/url_request/url_request.h" @@ -174,7 +175,8 @@ std::string ServiceState::LoginToGoogle(const std::string& service, post_body += "&source=" + net::EscapeUrlEncodedData("CP-Service", true); post_body += "&service=" + net::EscapeUrlEncodedData(service, true); - net::URLRequest request(url, &fetcher_delegate, context.get()); + net::URLRequest request( + url, net::DEFAULT_PRIORITY, &fetcher_delegate, context.get()); int load_flags = request.load_flags(); load_flags = load_flags | net::LOAD_DO_NOT_SEND_COOKIES; load_flags = load_flags | net::LOAD_DO_NOT_SAVE_COOKIES; diff --git a/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc b/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc index 3ac238c..86970564 100644 --- a/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc +++ b/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc @@ -22,6 +22,7 @@ #include "content/public/common/page_transition_types.h" #include "content/public/test/mock_resource_context.h" #include "content/public/test/test_renderer_host.h" +#include "net/base/request_priority.h" #include "net/http/http_response_headers.h" #include "net/http/http_response_info.h" #include "net/url_request/url_request.h" @@ -118,7 +119,10 @@ class TestIOThreadState { RedirectMode redirect_mode, MockInterceptCallbackReceiver* callback_receiver) : resource_context_(&test_url_request_context_), - request_(url, NULL, resource_context_.GetRequestContext()) { + request_(url, + net::DEFAULT_PRIORITY, + NULL, + resource_context_.GetRequestContext()) { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); if (render_process_id != MSG_ROUTING_NONE && render_view_id != MSG_ROUTING_NONE) { diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc index 36967c5..bd66f06 100644 --- a/content/browser/download/download_manager_impl.cc +++ b/content/browser/download/download_manager_impl.cc @@ -40,6 +40,7 @@ #include "content/public/browser/web_contents_delegate.h" #include "content/public/common/referrer.h" #include "net/base/load_flags.h" +#include "net/base/request_priority.h" #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" #include "net/url_request/url_request_context.h" @@ -55,7 +56,7 @@ void BeginDownload(scoped_ptr<DownloadUrlParameters> params, // we must down cast. RDHI is the only subclass of RDH as of 2012 May 4. scoped_ptr<net::URLRequest> request( params->resource_context()->GetRequestContext()->CreateRequest( - params->url(), NULL)); + params->url(), net::DEFAULT_PRIORITY, NULL)); request->set_load_flags(request->load_flags() | params->load_flags()); request->set_method(params->method()); if (!params->post_body().empty()) { diff --git a/content/browser/fileapi/blob_url_request_job_unittest.cc b/content/browser/fileapi/blob_url_request_job_unittest.cc index 90da3aa..93cacb24 100644 --- a/content/browser/fileapi/blob_url_request_job_unittest.cc +++ b/content/browser/fileapi/blob_url_request_job_unittest.cc @@ -12,6 +12,7 @@ #include "base/time/time.h" #include "content/public/test/test_file_system_context.h" #include "net/base/io_buffer.h" +#include "net/base/request_priority.h" #include "net/http/http_request_headers.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request.h" @@ -237,8 +238,8 @@ class BlobURLRequestJobTest : public testing::Test { void TestRequest(const std::string& method, const net::HttpRequestHeaders& extra_headers) { - request_.reset(url_request_context_.CreateRequest( - GURL("blob:blah"), &url_request_delegate_)); + request_ = url_request_context_.CreateRequest( + GURL("blob:blah"), net::DEFAULT_PRIORITY, &url_request_delegate_); request_->set_method(method); if (!extra_headers.IsEmpty()) request_->SetExtraRequestHeaders(extra_headers); diff --git a/content/browser/fileapi/file_system_dir_url_request_job_unittest.cc b/content/browser/fileapi/file_system_dir_url_request_job_unittest.cc index 79eb9f5..874e61b 100644 --- a/content/browser/fileapi/file_system_dir_url_request_job_unittest.cc +++ b/content/browser/fileapi/file_system_dir_url_request_job_unittest.cc @@ -18,6 +18,7 @@ #include "content/public/test/test_file_system_context.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" +#include "net/base/request_priority.h" #include "net/http/http_request_headers.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" @@ -82,7 +83,8 @@ class FileSystemDirURLRequestJobTest : public testing::Test { FileSystemContext* file_system_context) { delegate_.reset(new net::TestDelegate()); delegate_->set_quit_on_redirect(true); - request_.reset(empty_context_.CreateRequest(url, delegate_.get())); + request_ = empty_context_.CreateRequest( + url, net::DEFAULT_PRIORITY, delegate_.get()); job_ = new FileSystemDirURLRequestJob( request_.get(), NULL, file_system_context); diff --git a/content/browser/fileapi/file_system_url_request_job_unittest.cc b/content/browser/fileapi/file_system_url_request_job_unittest.cc index 3df243f..f414332 100644 --- a/content/browser/fileapi/file_system_url_request_job_unittest.cc +++ b/content/browser/fileapi/file_system_url_request_job_unittest.cc @@ -25,6 +25,7 @@ #include "net/base/mime_util.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" +#include "net/base/request_priority.h" #include "net/http/http_request_headers.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" @@ -97,7 +98,8 @@ class FileSystemURLRequestJobTest : public testing::Test { // Make delegate_ exit the MessageLoop when the request is done. delegate_->set_quit_on_complete(true); delegate_->set_quit_on_redirect(true); - request_.reset(empty_context_.CreateRequest(url, delegate_.get())); + request_ = empty_context_.CreateRequest( + url, net::DEFAULT_PRIORITY, delegate_.get()); if (headers) request_->SetExtraRequestHeaders(*headers); ASSERT_TRUE(!job_); diff --git a/content/browser/fileapi/file_writer_delegate_unittest.cc b/content/browser/fileapi/file_writer_delegate_unittest.cc index db0dba6..c18877f 100644 --- a/content/browser/fileapi/file_writer_delegate_unittest.cc +++ b/content/browser/fileapi/file_writer_delegate_unittest.cc @@ -13,6 +13,7 @@ #include "base/run_loop.h" #include "content/public/test/test_file_system_context.h" #include "net/base/io_buffer.h" +#include "net/base/request_priority.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_job.h" @@ -129,8 +130,8 @@ class FileWriterDelegateTest : public PlatformTest { int64 allowed_growth) { file_writer_delegate_.reset( CreateWriterDelegate(test_file_path, offset, allowed_growth)); - request_.reset(empty_context_.CreateRequest( - blob_url, file_writer_delegate_.get())); + request_ = empty_context_.CreateRequest( + blob_url, net::DEFAULT_PRIORITY, file_writer_delegate_.get()); } static net::URLRequest::ProtocolFactory Factory; @@ -326,8 +327,8 @@ TEST_F(FileWriterDelegateTest, WriteSuccessWithoutQuotaLimitConcurrent) { // Credate another FileWriterDelegate for concurrent write. file_writer_delegate2.reset(CreateWriterDelegate("test2", 0, kint64max)); - request2.reset(empty_context_.CreateRequest( - kBlobURL2, file_writer_delegate2.get())); + request2 = empty_context_.CreateRequest( + kBlobURL2, net::DEFAULT_PRIORITY, file_writer_delegate2.get()); Result result, result2; ASSERT_EQ(0, usage()); diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc index 657b385..1e66263 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc @@ -1040,7 +1040,8 @@ void ResourceDispatcherHostImpl::BeginRequest( // Construct the request. scoped_ptr<net::URLRequest> new_request; net::URLRequest* request; - new_request.reset(request_context->CreateRequest(request_data.url, NULL)); + new_request = request_context->CreateRequest( + request_data.url, request_data.priority, NULL); request = new_request.get(); request->set_method(request_data.method); @@ -1052,7 +1053,6 @@ void ResourceDispatcherHostImpl::BeginRequest( request->SetExtraRequestHeaders(headers); request->set_load_flags(load_flags); - request->SetPriority(request_data.priority); // Resolve elements from request_body and prepare upload data. if (request_data.request_body.get()) { @@ -1293,7 +1293,7 @@ void ResourceDispatcherHostImpl::BeginSaveFile( } scoped_ptr<net::URLRequest> request( - request_context->CreateRequest(url, NULL)); + request_context->CreateRequest(url, net::DEFAULT_PRIORITY, NULL)); request->set_method("GET"); SetReferrerForRequest(request.get(), referrer); diff --git a/content/browser/loader/resource_dispatcher_host_unittest.cc b/content/browser/loader/resource_dispatcher_host_unittest.cc index 4939b80..900b5d1 100644 --- a/content/browser/loader/resource_dispatcher_host_unittest.cc +++ b/content/browser/loader/resource_dispatcher_host_unittest.cc @@ -32,6 +32,7 @@ #include "content/public/test/test_browser_context.h" #include "content/test/test_content_browser_client.h" #include "net/base/net_errors.h" +#include "net/base/request_priority.h" #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" #include "net/http/http_util.h" @@ -1514,7 +1515,8 @@ TEST_F(ResourceDispatcherHostTest, TestBlockedRequestsDontLeak) { // Test the private helper method "CalculateApproximateMemoryCost()". TEST_F(ResourceDispatcherHostTest, CalculateApproximateMemoryCost) { net::URLRequestContext context; - net::URLRequest req(GURL("http://www.google.com"), NULL, &context); + net::URLRequest req( + GURL("http://www.google.com"), net::DEFAULT_PRIORITY, NULL, &context); EXPECT_EQ(4427, ResourceDispatcherHostImpl::CalculateApproximateMemoryCost(&req)); diff --git a/content/browser/loader/resource_loader_unittest.cc b/content/browser/loader/resource_loader_unittest.cc index d228300..194930e 100644 --- a/content/browser/loader/resource_loader_unittest.cc +++ b/content/browser/loader/resource_loader_unittest.cc @@ -11,6 +11,7 @@ #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" @@ -211,9 +212,11 @@ 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())); ResourceRequestInfo::AllocateForTesting(request.get(), ResourceType::MAIN_FRAME, &resource_context_, @@ -274,8 +277,11 @@ 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())); + scoped_ptr<net::URLRequest> request( + new net::URLRequest(GURL("dummy"), + net::DEFAULT_PRIORITY, + NULL, + resource_context_.GetRequestContext())); ResourceRequestInfo::AllocateForTesting(request.get(), ResourceType::MAIN_FRAME, &resource_context_, diff --git a/content/browser/loader/resource_scheduler_unittest.cc b/content/browser/loader/resource_scheduler_unittest.cc index adcb74e..dade9ff 100644 --- a/content/browser/loader/resource_scheduler_unittest.cc +++ b/content/browser/loader/resource_scheduler_unittest.cc @@ -17,6 +17,7 @@ #include "content/public/browser/resource_throttle.h" #include "content/public/common/process_type.h" #include "net/base/host_port_pair.h" +#include "net/base/request_priority.h" #include "net/http/http_server_properties_impl.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_test_util.h" @@ -139,8 +140,7 @@ class ResourceSchedulerTest : public testing::Test { net::RequestPriority priority, int route_id) { scoped_ptr<net::URLRequest> url_request( - context_.CreateRequest(GURL(url), NULL)); - url_request->SetPriority(priority); + context_.CreateRequest(GURL(url), priority, NULL)); ResourceRequestInfoImpl* info = new ResourceRequestInfoImpl( PROCESS_TYPE_RENDERER, // process_type kChildId, // child_id diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc index 7fd1870..f926ff6 100644 --- a/content/browser/renderer_host/render_message_filter.cc +++ b/content/browser/renderer_host/render_message_filter.cc @@ -834,7 +834,8 @@ void RenderMessageFilter::OnDownloadUrl(const IPC::Message& message, scoped_ptr<DownloadSaveInfo> save_info(new DownloadSaveInfo()); save_info->suggested_name = suggested_name; scoped_ptr<net::URLRequest> request( - resource_context_->GetRequestContext()->CreateRequest(url, NULL)); + resource_context_->GetRequestContext()->CreateRequest( + url, net::DEFAULT_PRIORITY, NULL)); RecordDownloadSource(INITIATED_BY_RENDERER); resource_dispatcher_host_->BeginDownload( request.Pass(), diff --git a/content/browser/streams/stream_url_request_job_unittest.cc b/content/browser/streams/stream_url_request_job_unittest.cc index 8914fe5..464f916 100644 --- a/content/browser/streams/stream_url_request_job_unittest.cc +++ b/content/browser/streams/stream_url_request_job_unittest.cc @@ -8,6 +8,7 @@ #include "content/browser/streams/stream_registry.h" #include "content/browser/streams/stream_url_request_job.h" #include "content/browser/streams/stream_write_observer.h" +#include "net/base/request_priority.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" @@ -73,7 +74,8 @@ class StreamURLRequestJobTest : public testing::Test { int expected_status_code, const std::string& expected_response) { net::TestDelegate delegate; - request_.reset(url_request_context_.CreateRequest(url, &delegate)); + request_ = url_request_context_.CreateRequest( + url, net::DEFAULT_PRIORITY, &delegate); request_->set_method(method); if (!extra_headers.IsEmpty()) request_->SetExtraRequestHeaders(extra_headers); @@ -130,7 +132,8 @@ TEST_F(StreamURLRequestJobTest, TestGetLargeStreamRequest) { TEST_F(StreamURLRequestJobTest, TestGetNonExistentStreamRequest) { net::TestDelegate delegate; - request_.reset(url_request_context_.CreateRequest(kStreamURL, &delegate)); + request_ = url_request_context_.CreateRequest( + kStreamURL, net::DEFAULT_PRIORITY, &delegate); request_->set_method("GET"); request_->Start(); diff --git a/net/ocsp/nss_ocsp.cc b/net/ocsp/nss_ocsp.cc index aea8fc2..d83b239 100644 --- a/net/ocsp/nss_ocsp.cc +++ b/net/ocsp/nss_ocsp.cc @@ -32,6 +32,7 @@ #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" #include "net/base/load_flags.h" +#include "net/base/request_priority.h" #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" #include "net/http/http_request_headers.h" @@ -393,7 +394,8 @@ class OCSPRequestSession g_ocsp_io_loop.Get().AddRequest(this); } - request_ = new URLRequest(url_, this, url_request_context); + request_ = + new URLRequest(url_, DEFAULT_PRIORITY, this, url_request_context); // To meet the privacy requirements of incognito mode. request_->set_load_flags(LOAD_DISABLE_CACHE | LOAD_DO_NOT_SAVE_COOKIES | LOAD_DO_NOT_SEND_COOKIES); diff --git a/net/proxy/proxy_script_fetcher_impl.cc b/net/proxy/proxy_script_fetcher_impl.cc index f8925fa..68a8205 100644 --- a/net/proxy/proxy_script_fetcher_impl.cc +++ b/net/proxy/proxy_script_fetcher_impl.cc @@ -13,6 +13,7 @@ #include "net/base/io_buffer.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" +#include "net/base/request_priority.h" #include "net/cert/cert_status_flags.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request_context.h" @@ -133,7 +134,8 @@ int ProxyScriptFetcherImpl::Fetch( return OK; } - cur_request_.reset(url_request_context_->CreateRequest(url, this)); + cur_request_ = + url_request_context_->CreateRequest(url, DEFAULT_PRIORITY, this); cur_request_->set_method("GET"); // Make sure that the PAC script is downloaded using a direct connection, diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc index 46cebe3..780d147 100644 --- a/net/spdy/spdy_network_transaction_unittest.cc +++ b/net/spdy/spdy_network_transaction_unittest.cc @@ -2466,8 +2466,10 @@ TEST_P(SpdyNetworkTransactionTest, RedirectGetRequest) { TestDelegate d; { SpdyURLRequestContext spdy_url_request_context(GetParam().protocol); - net::URLRequest r( - GURL("http://www.google.com/"), &d, &spdy_url_request_context); + net::URLRequest r(GURL("http://www.google.com/"), + DEFAULT_PRIORITY, + &d, + &spdy_url_request_context); spdy_url_request_context.socket_factory(). AddSocketDataProvider(&data); spdy_url_request_context.socket_factory(). @@ -2559,8 +2561,10 @@ TEST_P(SpdyNetworkTransactionTest, RedirectServerPush) { TestDelegate d2; SpdyURLRequestContext spdy_url_request_context(GetParam().protocol); { - net::URLRequest r( - GURL("http://www.google.com/"), &d, &spdy_url_request_context); + net::URLRequest r(GURL("http://www.google.com/"), + DEFAULT_PRIORITY, + &d, + &spdy_url_request_context); spdy_url_request_context.socket_factory(). AddSocketDataProvider(&data); @@ -2571,8 +2575,10 @@ TEST_P(SpdyNetworkTransactionTest, RedirectServerPush) { std::string contents("hello!"); EXPECT_EQ(contents, d.data_received()); - net::URLRequest r2( - GURL("http://www.google.com/foo.dat"), &d2, &spdy_url_request_context); + net::URLRequest r2(GURL("http://www.google.com/foo.dat"), + DEFAULT_PRIORITY, + &d2, + &spdy_url_request_context); spdy_url_request_context.socket_factory(). AddSocketDataProvider(&data2); diff --git a/net/test/spawned_test_server/spawner_communicator.cc b/net/test/spawned_test_server/spawner_communicator.cc index f93ff97..3887157 100644 --- a/net/test/spawned_test_server/spawner_communicator.cc +++ b/net/test/spawned_test_server/spawner_communicator.cc @@ -13,6 +13,7 @@ #include "base/values.h" #include "build/build_config.h" #include "net/base/net_util.h" +#include "net/base/request_priority.h" #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" #include "net/http/http_response_headers.h" @@ -171,9 +172,9 @@ void SpawnerCommunicator::SendCommandAndWaitForResultOnIOThread( // Prepare the URLRequest for sending the command. DCHECK(!cur_request_.get()); context_.reset(new TestURLRequestContext); - cur_request_.reset(context_->CreateRequest( - GenerateSpawnerCommandURL(command, port_), this)); - DCHECK(cur_request_.get()); + cur_request_ = context_->CreateRequest( + GenerateSpawnerCommandURL(command, port_), DEFAULT_PRIORITY, this); + DCHECK(cur_request_); int current_request_id = ++next_id_; SpawnerRequestData* data = new SpawnerRequestData(current_request_id, result_code, diff --git a/net/url_request/url_fetcher_core.cc b/net/url_request/url_fetcher_core.cc index bd28b4b..113ced7 100644 --- a/net/url_request/url_fetcher_core.cc +++ b/net/url_request/url_fetcher_core.cc @@ -14,6 +14,7 @@ #include "net/base/io_buffer.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" +#include "net/base/request_priority.h" #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" #include "net/base/upload_file_element_reader.h" @@ -502,8 +503,8 @@ void URLFetcherCore::StartURLRequest() { g_registry.Get().AddURLFetcherCore(this); current_response_bytes_ = 0; - request_.reset(request_context_getter_->GetURLRequestContext()->CreateRequest( - original_url_, this)); + request_ = request_context_getter_->GetURLRequestContext()->CreateRequest( + original_url_, DEFAULT_PRIORITY, this); request_->set_stack_trace(stack_trace_); int flags = request_->load_flags() | load_flags_; if (!g_interception_enabled) diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc index 57e9fb8..dae9d0e 100644 --- a/net/url_request/url_request.cc +++ b/net/url_request/url_request.cc @@ -200,8 +200,8 @@ void URLRequest::Delegate::OnSSLCertificateError(URLRequest* request, /////////////////////////////////////////////////////////////////////////////// // URLRequest -// TODO(shalev): Get rid of this constructor in favour of the one below it. URLRequest::URLRequest(const GURL& url, + RequestPriority priority, Delegate* delegate, const URLRequestContext* context) : context_(context), @@ -216,44 +216,7 @@ URLRequest::URLRequest(const GURL& url, is_pending_(false), is_redirecting_(false), redirect_limit_(kMaxRedirects), - priority_(DEFAULT_PRIORITY), - identifier_(GenerateURLRequestIdentifier()), - calling_delegate_(false), - delegate_info_usage_(DELEGATE_INFO_DEBUG_ONLY), - before_request_callback_(base::Bind(&URLRequest::BeforeRequestComplete, - base::Unretained(this))), - has_notified_completion_(false), - received_response_content_length_(0), - creation_time_(base::TimeTicks::Now()) { - SIMPLE_STATS_COUNTER("URLRequestCount"); - - // Sanity check out environment. - DCHECK(base::MessageLoop::current()) - << "The current base::MessageLoop must exist"; - - CHECK(context); - context->url_requests()->insert(this); - - net_log_.BeginEvent(NetLog::TYPE_REQUEST_ALIVE); -} - -URLRequest::URLRequest(const GURL& url, - Delegate* delegate, - const URLRequestContext* context, - NetworkDelegate* network_delegate) - : context_(context), - network_delegate_(network_delegate), - net_log_(BoundNetLog::Make(context->net_log(), - NetLog::SOURCE_URL_REQUEST)), - url_chain_(1, url), - method_("GET"), - referrer_policy_(CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE), - load_flags_(LOAD_NORMAL), - delegate_(delegate), - is_pending_(false), - is_redirecting_(false), - redirect_limit_(kMaxRedirects), - priority_(DEFAULT_PRIORITY), + priority_(priority), identifier_(GenerateURLRequestIdentifier()), calling_delegate_(false), delegate_info_usage_(DELEGATE_INFO_DEBUG_ONLY), diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h index 1145f63..e35e9fa 100644 --- a/net/url_request/url_request.h +++ b/net/url_request/url_request.h @@ -308,17 +308,11 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe), virtual ~Delegate() {} }; - // TODO(shalev): Get rid of this constructor in favour of the one below it. - // Initialize an URL request. URLRequest(const GURL& url, + RequestPriority priority, Delegate* delegate, const URLRequestContext* context); - URLRequest(const GURL& url, - Delegate* delegate, - const URLRequestContext* context, - NetworkDelegate* network_delegate); - // If destroyed after Start() has been called but while IO is pending, // then the request will be effectively canceled and the delegate // will not have any more of its methods called. diff --git a/net/url_request/url_request_context.cc b/net/url_request/url_request_context.cc index 45ac83f..b5c5313 100644 --- a/net/url_request/url_request_context.cc +++ b/net/url_request/url_request_context.cc @@ -68,9 +68,11 @@ const HttpNetworkSession::Params* URLRequestContext::GetNetworkSessionParams( return &network_session->params(); } -URLRequest* URLRequestContext::CreateRequest( - const GURL& url, URLRequest::Delegate* delegate) const { - return new URLRequest(url, delegate, this, network_delegate_); +scoped_ptr<URLRequest> URLRequestContext::CreateRequest( + const GURL& url, + RequestPriority priority, + URLRequest::Delegate* delegate) const { + return scoped_ptr<URLRequest>(new URLRequest(url, priority, delegate, this)); } void URLRequestContext::set_cookie_store(CookieStore* cookie_store) { diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h index bf9921e..b23646f 100644 --- a/net/url_request/url_request_context.h +++ b/net/url_request/url_request_context.h @@ -19,6 +19,7 @@ #include "base/threading/non_thread_safe.h" #include "net/base/net_export.h" #include "net/base/net_log.h" +#include "net/base/request_priority.h" #include "net/http/http_network_session.h" #include "net/http/http_server_properties.h" #include "net/http/transport_security_state.h" @@ -56,8 +57,9 @@ class NET_EXPORT URLRequestContext // May return NULL if this context doesn't have an associated network session. const HttpNetworkSession::Params* GetNetworkSessionParams() const; - URLRequest* CreateRequest( - const GURL& url, URLRequest::Delegate* delegate) const; + scoped_ptr<URLRequest> CreateRequest(const GURL& url, + RequestPriority priority, + URLRequest::Delegate* delegate) const; NetLog* net_log() const { return net_log_; diff --git a/net/url_request/url_request_context_builder_unittest.cc b/net/url_request/url_request_context_builder_unittest.cc index f747b4d..e882253 100644 --- a/net/url_request/url_request_context_builder_unittest.cc +++ b/net/url_request/url_request_context_builder_unittest.cc @@ -5,6 +5,7 @@ #include "net/url_request/url_request_context_builder.h" #include "build/build_config.h" +#include "net/base/request_priority.h" #include "net/test/spawned_test_server/spawned_test_server.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_test_util.h" @@ -55,8 +56,10 @@ TEST_F(URLRequestContextBuilderTest, DefaultSettings) { scoped_ptr<URLRequestContext> context(builder_.Build()); TestDelegate delegate; - URLRequest request( - test_server_.GetURL("echoheader?Foo"), &delegate, context.get()); + URLRequest request(test_server_.GetURL("echoheader?Foo"), + DEFAULT_PRIORITY, + &delegate, + context.get()); request.set_method("GET"); request.SetExtraRequestHeaderByName("Foo", "Bar", false); request.Start(); @@ -70,8 +73,10 @@ TEST_F(URLRequestContextBuilderTest, UserAgent) { builder_.set_user_agent("Bar"); scoped_ptr<URLRequestContext> context(builder_.Build()); TestDelegate delegate; - URLRequest request( - test_server_.GetURL("echoheader?User-Agent"), &delegate, context.get()); + URLRequest request(test_server_.GetURL("echoheader?User-Agent"), + DEFAULT_PRIORITY, + &delegate, + context.get()); request.set_method("GET"); request.Start(); base::MessageLoop::current()->Run(); diff --git a/net/url_request/url_request_filter_unittest.cc b/net/url_request/url_request_filter_unittest.cc index 3a41466..2e024a2 100644 --- a/net/url_request/url_request_filter_unittest.cc +++ b/net/url_request/url_request_filter_unittest.cc @@ -5,6 +5,7 @@ #include "net/url_request/url_request_filter.h" #include "base/memory/scoped_ptr.h" +#include "net/base/request_priority.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_job.h" @@ -53,10 +54,12 @@ TEST(URLRequestFilter, BasicMatching) { TestURLRequestContext request_context; GURL url_1("http://foo.com/"); - TestURLRequest request_1(url_1, &delegate, &request_context, NULL); + TestURLRequest request_1( + url_1, DEFAULT_PRIORITY, &delegate, &request_context); GURL url_2("http://bar.com/"); - TestURLRequest request_2(url_2, &delegate, &request_context, NULL); + TestURLRequest request_2( + url_2, DEFAULT_PRIORITY, &delegate, &request_context); // Check AddUrlHandler checks for invalid URLs. EXPECT_FALSE(URLRequestFilter::GetInstance()->AddUrlHandler(GURL(), diff --git a/net/url_request/url_request_ftp_job_unittest.cc b/net/url_request/url_request_ftp_job_unittest.cc index f9eafab..4bc6675 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,10 @@ 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_); } @@ -262,9 +266,9 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequest) { 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); @@ -287,9 +291,9 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestOrphanJob) { 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, @@ -315,9 +319,9 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedProxyAuthNoCredentials) { 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); @@ -359,9 +363,9 @@ 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()); + request_context()); url_request.Start(); ASSERT_TRUE(url_request.is_pending()); socket_data(0)->RunFor(9); @@ -392,9 +396,9 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedServerAuthNoCredentials) { 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); @@ -436,9 +440,9 @@ 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()); + request_context()); url_request.Start(); ASSERT_TRUE(url_request.is_pending()); socket_data(0)->RunFor(9); @@ -501,10 +505,8 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedProxyAndServerAuth) { 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); @@ -537,9 +539,9 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestDoNotSaveCookies) { 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()); @@ -571,9 +573,9 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestDoNotFollowRedirects) { 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()); @@ -615,9 +617,9 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestReuseSocket) { 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); @@ -630,9 +632,9 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestReuseSocket) { 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); @@ -676,9 +678,9 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestDoNotReuseSocket) { 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); @@ -691,9 +693,9 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestDoNotReuseSocket) { 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); diff --git a/net/url_request/url_request_http_job_unittest.cc b/net/url_request/url_request_http_job_unittest.cc index ce72054..50d3391 100644 --- a/net/url_request/url_request_http_job_unittest.cc +++ b/net/url_request/url_request_http_job_unittest.cc @@ -9,6 +9,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "net/base/auth.h" +#include "net/base/request_priority.h" #include "net/http/http_transaction_factory.h" #include "net/http/http_transaction_unittest.h" #include "net/url_request/url_request_status.h" @@ -40,7 +41,10 @@ class TestURLRequestHttpJob : public URLRequestHttpJob { class URLRequestHttpJobTest : public ::testing::Test { protected: URLRequestHttpJobTest() - : req_(GURL("http://www.example.com"), &delegate_, &context_, NULL) { + : req_(GURL("http://www.example.com"), + DEFAULT_PRIORITY, + &delegate_, + &context_) { context_.set_http_transaction_factory(&network_layer_); } diff --git a/net/url_request/url_request_job_factory_impl_unittest.cc b/net/url_request/url_request_job_factory_impl_unittest.cc index 078e16a..93ca0f8 100644 --- a/net/url_request/url_request_job_factory_impl_unittest.cc +++ b/net/url_request/url_request_job_factory_impl_unittest.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/memory/weak_ptr.h" +#include "net/base/request_priority.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_job.h" #include "net/url_request/url_request_test_util.h" @@ -59,7 +60,8 @@ class DummyProtocolHandler : public URLRequestJobFactory::ProtocolHandler { TEST(URLRequestJobFactoryTest, NoProtocolHandler) { TestDelegate delegate; TestURLRequestContext request_context; - TestURLRequest request(GURL("foo://bar"), &delegate, &request_context, NULL); + TestURLRequest request( + GURL("foo://bar"), DEFAULT_PRIORITY, &delegate, &request_context); request.Start(); base::MessageLoop::current()->Run(); @@ -73,7 +75,8 @@ TEST(URLRequestJobFactoryTest, BasicProtocolHandler) { TestURLRequestContext request_context; request_context.set_job_factory(&job_factory); job_factory.SetProtocolHandler("foo", new DummyProtocolHandler); - TestURLRequest request(GURL("foo://bar"), &delegate, &request_context, NULL); + TestURLRequest request( + GURL("foo://bar"), DEFAULT_PRIORITY, &delegate, &request_context); request.Start(); base::MessageLoop::current()->Run(); diff --git a/net/url_request/url_request_job_unittest.cc b/net/url_request/url_request_job_unittest.cc index 5f63b09..99f4314 100644 --- a/net/url_request/url_request_job_unittest.cc +++ b/net/url_request/url_request_job_unittest.cc @@ -4,66 +4,71 @@ #include "net/url_request/url_request_job.h" +#include "net/base/request_priority.h" #include "net/http/http_transaction_unittest.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" +namespace net { + namespace { // This is a header that signals the end of the data. const char kGzipGata[] = "\x1f\x08b\x08\0\0\0\0\0\0\3\3\0\0\0\0\0\0\0\0"; -void GZipServer(const net::HttpRequestInfo* request, - std::string* response_status, std::string* response_headers, +void GZipServer(const HttpRequestInfo* request, + std::string* response_status, + std::string* response_headers, std::string* response_data) { response_data->assign(kGzipGata, sizeof(kGzipGata)); } const MockTransaction kGZip_Transaction = { - "http://www.google.com/gzyp", - "GET", - base::Time(), - "", - net::LOAD_NORMAL, - "HTTP/1.1 200 OK", - "Cache-Control: max-age=10000\n" - "Content-Encoding: gzip\n" - "Content-Length: 30\n", // Intentionally wrong. - base::Time(), - "", - TEST_MODE_NORMAL, - &GZipServer, - 0, - net::OK + "http://www.google.com/gzyp", + "GET", + base::Time(), + "", + LOAD_NORMAL, + "HTTP/1.1 200 OK", + "Cache-Control: max-age=10000\n" + "Content-Encoding: gzip\n" + "Content-Length: 30\n", // Intentionally wrong. + base::Time(), + "", + TEST_MODE_NORMAL, + &GZipServer, + 0, + OK }; const MockTransaction kRedirect_Transaction = { - "http://www.google.com/redirect", - "GET", - base::Time(), - "", - net::LOAD_NORMAL, - "HTTP/1.1 302 Found", - "Cache-Control: max-age=10000\n" - "Location: http://www.google.com/destination\n" - "Content-Length: 5\n", - base::Time(), - "hello", - TEST_MODE_NORMAL, - NULL, - 0, - net::OK + "http://www.google.com/redirect", + "GET", + base::Time(), + "", + LOAD_NORMAL, + "HTTP/1.1 302 Found", + "Cache-Control: max-age=10000\n" + "Location: http://www.google.com/destination\n" + "Content-Length: 5\n", + base::Time(), + "hello", + TEST_MODE_NORMAL, + NULL, + 0, + OK }; } // namespace TEST(URLRequestJob, TransactionNotifiedWhenDone) { MockNetworkLayer network_layer; - net::TestURLRequestContext context; + TestURLRequestContext context; context.set_http_transaction_factory(&network_layer); - net::TestDelegate d; - net::TestURLRequest req(GURL(kGZip_Transaction.url), &d, &context, NULL); + TestDelegate d; + TestURLRequest req( + GURL(kGZip_Transaction.url), DEFAULT_PRIORITY, &d, &context); AddMockTransaction(&kGZip_Transaction); req.set_method("GET"); @@ -78,11 +83,12 @@ TEST(URLRequestJob, TransactionNotifiedWhenDone) { TEST(URLRequestJob, SyncTransactionNotifiedWhenDone) { MockNetworkLayer network_layer; - net::TestURLRequestContext context; + TestURLRequestContext context; context.set_http_transaction_factory(&network_layer); - net::TestDelegate d; - net::TestURLRequest req(GURL(kGZip_Transaction.url), &d, &context, NULL); + TestDelegate d; + TestURLRequest req( + GURL(kGZip_Transaction.url), DEFAULT_PRIORITY, &d, &context); MockTransaction transaction(kGZip_Transaction); transaction.test_mode = TEST_MODE_SYNC_ALL; AddMockTransaction(&transaction); @@ -99,11 +105,12 @@ TEST(URLRequestJob, SyncTransactionNotifiedWhenDone) { TEST(URLRequestJob, RedirectTransactionNotifiedWhenDone) { MockNetworkLayer network_layer; - net::TestURLRequestContext context; + TestURLRequestContext context; context.set_http_transaction_factory(&network_layer); - net::TestDelegate d; - net::TestURLRequest req(GURL(kRedirect_Transaction.url), &d, &context, NULL); + TestDelegate d; + TestURLRequest req( + GURL(kRedirect_Transaction.url), DEFAULT_PRIORITY, &d, &context); AddMockTransaction(&kRedirect_Transaction); req.set_method("GET"); @@ -115,3 +122,5 @@ TEST(URLRequestJob, RedirectTransactionNotifiedWhenDone) { RemoveMockTransaction(&kRedirect_Transaction); } + +} // namespace net diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc index 8b209f9..9f9abcd 100644 --- a/net/url_request/url_request_test_util.cc +++ b/net/url_request/url_request_test_util.cc @@ -127,11 +127,10 @@ void TestURLRequestContext::Init() { } TestURLRequest::TestURLRequest(const GURL& url, + RequestPriority priority, Delegate* delegate, - TestURLRequestContext* context, - NetworkDelegate* network_delegate) - : URLRequest(url, delegate, context, network_delegate) { -} + TestURLRequestContext* context) + : URLRequest(url, priority, delegate, context) {} TestURLRequest::~TestURLRequest() { } diff --git a/net/url_request/url_request_test_util.h b/net/url_request/url_request_test_util.h index 796b913..c0dc1a0 100644 --- a/net/url_request/url_request_test_util.h +++ b/net/url_request/url_request_test_util.h @@ -23,6 +23,7 @@ #include "net/base/load_timing_info.h" #include "net/base/net_errors.h" #include "net/base/network_delegate.h" +#include "net/base/request_priority.h" #include "net/cert/cert_verifier.h" #include "net/cookies/cookie_monster.h" #include "net/disk_cache/disk_cache.h" @@ -107,9 +108,10 @@ class TestURLRequestContextGetter : public URLRequestContextGetter { class TestURLRequest : public URLRequest { public: - TestURLRequest( - const GURL& url, Delegate* delegate, - TestURLRequestContext* context, NetworkDelegate* network_delegate); + TestURLRequest(const GURL& url, + RequestPriority priority, + Delegate* delegate, + TestURLRequestContext* context); virtual ~TestURLRequest(); }; diff --git a/net/url_request/url_request_throttler_simulation_unittest.cc b/net/url_request/url_request_throttler_simulation_unittest.cc index 059c80f..c68f59a 100644 --- a/net/url_request/url_request_throttler_simulation_unittest.cc +++ b/net/url_request/url_request_throttler_simulation_unittest.cc @@ -20,6 +20,7 @@ #include "base/memory/scoped_vector.h" #include "base/rand_util.h" #include "base/time/time.h" +#include "net/base/request_priority.h" #include "net/url_request/url_request_test_util.h" #include "net/url_request/url_request_throttler_manager.h" #include "net/url_request/url_request_throttler_test_support.h" @@ -116,16 +117,14 @@ class DiscreteTimeSimulation { // after all |Requester| objects. class Server : public DiscreteTimeSimulation::Actor { public: - Server(int max_queries_per_tick, - double request_drop_ratio) + Server(int max_queries_per_tick, double request_drop_ratio) : max_queries_per_tick_(max_queries_per_tick), request_drop_ratio_(request_drop_ratio), num_overloaded_ticks_remaining_(0), num_current_tick_queries_(0), num_overloaded_ticks_(0), max_experienced_queries_per_tick_(0), - mock_request_(GURL(), NULL, &context_, NULL) { - } + mock_request_(GURL(), DEFAULT_PRIORITY, NULL, &context_) {} void SetDowntime(const TimeTicks& start_time, const TimeDelta& duration) { start_downtime_ = start_time; diff --git a/net/url_request/url_request_throttler_unittest.cc b/net/url_request/url_request_throttler_unittest.cc index e47da30..c291a67 100644 --- a/net/url_request/url_request_throttler_unittest.cc +++ b/net/url_request/url_request_throttler_unittest.cc @@ -14,6 +14,7 @@ #include "base/strings/stringprintf.h" #include "base/time/time.h" #include "net/base/load_flags.h" +#include "net/base/request_priority.h" #include "net/base/test_completion_callback.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_test_util.h" @@ -172,8 +173,8 @@ struct GurlAndString { class URLRequestThrottlerEntryTest : public testing::Test { protected: - URLRequestThrottlerEntryTest() : request_(GURL(), NULL, &context_, NULL) { - } + URLRequestThrottlerEntryTest() + : request_(GURL(), DEFAULT_PRIORITY, NULL, &context_) {} virtual void SetUp(); virtual void TearDown(); @@ -391,8 +392,7 @@ TEST_F(URLRequestThrottlerEntryTest, ExplicitUserRequest) { class URLRequestThrottlerManagerTest : public testing::Test { protected: URLRequestThrottlerManagerTest() - : request_(GURL(), NULL, &context_, NULL) { - } + : request_(GURL(), DEFAULT_PRIORITY, NULL, &context_) {} virtual void SetUp() { request_.set_load_flags(0); diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 08aa1b15..daf4c57 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -37,6 +37,7 @@ #include "net/base/net_log_unittest.h" #include "net/base/net_module.h" #include "net/base/net_util.h" +#include "net/base/request_priority.h" #include "net/base/test_data_directory.h" #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_data_stream.h" @@ -621,7 +622,7 @@ class URLRequestTest : public PlatformTest { TEST_F(URLRequestTest, AboutBlankTest) { TestDelegate d; { - URLRequest r(GURL("about:blank"), &d, &default_context_); + URLRequest r(GURL("about:blank"), DEFAULT_PRIORITY, &d, &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -643,7 +644,8 @@ TEST_F(URLRequestTest, DataURLImageTest) { TestDelegate d; { // Use our nice little Chrome logo. - URLRequest r(GURL( + URLRequest r( + GURL( "data:image/png;base64," "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADVklEQVQ4jX2TfUwUBBjG3" "w1y+HGcd9dxhXR8T4awOccJGgOSWclHImznLkTlSw0DDQXkrmgYgbUYnlQTqQxIEVxitD" @@ -663,6 +665,7 @@ TEST_F(URLRequestTest, DataURLImageTest) { "nlm2O34uI4b9tflqp1+QEFGzoW/ulmcofcpkZCYJhDfSpme7QcrHa+Xfji8paEQkTkSfm" "moRWRNZr/F1KfVMjW+IKEnv2FwZfKdzt0BQR6lClcZR0EfEXEfv/G6W9iLiIyCoReV5En" "hORIBHx+ufPj/gLB/zGI/G4Bk0AAAAASUVORK5CYII="), + DEFAULT_PRIORITY, &d, &default_context_); @@ -689,7 +692,7 @@ TEST_F(URLRequestTest, FileTest) { TestDelegate d; { - URLRequest r(app_url, &d, &default_context_); + URLRequest r(app_url, DEFAULT_PRIORITY, &d, &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -718,7 +721,7 @@ TEST_F(URLRequestTest, FileTestCancel) { TestDelegate d; { - URLRequest r(app_url, &d, &default_context_); + URLRequest r(app_url, DEFAULT_PRIORITY, &d, &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -750,7 +753,7 @@ TEST_F(URLRequestTest, FileTestFullSpecifiedRange) { TestDelegate d; { - URLRequest r(temp_url, &d, &default_context_); + URLRequest r(temp_url, DEFAULT_PRIORITY, &d, &default_context_); HttpRequestHeaders headers; headers.SetHeader(HttpRequestHeaders::kRange, @@ -794,7 +797,7 @@ TEST_F(URLRequestTest, FileTestHalfSpecifiedRange) { TestDelegate d; { - URLRequest r(temp_url, &d, &default_context_); + URLRequest r(temp_url, DEFAULT_PRIORITY, &d, &default_context_); HttpRequestHeaders headers; headers.SetHeader(HttpRequestHeaders::kRange, @@ -831,7 +834,7 @@ TEST_F(URLRequestTest, FileTestMultipleRanges) { TestDelegate d; { - URLRequest r(temp_url, &d, &default_context_); + URLRequest r(temp_url, DEFAULT_PRIORITY, &d, &default_context_); HttpRequestHeaders headers; headers.SetHeader(HttpRequestHeaders::kRange, @@ -850,7 +853,7 @@ TEST_F(URLRequestTest, FileTestMultipleRanges) { TEST_F(URLRequestTest, InvalidUrlTest) { TestDelegate d; { - URLRequest r(GURL("invalid url"), &d, &default_context_); + URLRequest r(GURL("invalid url"), DEFAULT_PRIORITY, &d, &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -887,7 +890,9 @@ TEST_F(URLRequestTest, ResolveShortcutTest) { TestDelegate d; { - URLRequest r(FilePathToFileURL(base::FilePath(lnk_path)), &d, + URLRequest r(FilePathToFileURL(base::FilePath(lnk_path)), + DEFAULT_PRIORITY, + &d, &default_context_); r.Start(); @@ -931,7 +936,8 @@ TEST_F(URLRequestTest, FileDirCancelTest) { file_path = file_path.Append(FILE_PATH_LITERAL("net")); file_path = file_path.Append(FILE_PATH_LITERAL("data")); - URLRequest req(FilePathToFileURL(file_path), &d, &default_context_); + URLRequest req( + FilePathToFileURL(file_path), DEFAULT_PRIORITY, &d, &default_context_); req.Start(); EXPECT_TRUE(req.is_pending()); @@ -957,7 +963,8 @@ TEST_F(URLRequestTest, FileDirOutputSanity) { path = path.Append(FILE_PATH_LITERAL("url_request_unittest")); TestDelegate d; - URLRequest req(FilePathToFileURL(path), &d, &default_context_); + URLRequest req( + FilePathToFileURL(path), DEFAULT_PRIORITY, &d, &default_context_); req.Start(); base::RunLoop().Run(); @@ -993,7 +1000,8 @@ TEST_F(URLRequestTest, FileDirRedirectNoCrash) { path = path.Append(FILE_PATH_LITERAL("url_request_unittest")); TestDelegate d; - URLRequest req(FilePathToFileURL(path), &d, &default_context_); + URLRequest req( + FilePathToFileURL(path), DEFAULT_PRIORITY, &d, &default_context_); req.Start(); base::RunLoop().Run(); @@ -1007,7 +1015,7 @@ TEST_F(URLRequestTest, FileDirRedirectNoCrash) { // Don't accept the url "file:///" on windows. See http://crbug.com/1474. TEST_F(URLRequestTest, FileDirRedirectSingleSlash) { TestDelegate d; - URLRequest req(GURL("file:///"), &d, &default_context_); + URLRequest req(GURL("file:///"), DEFAULT_PRIORITY, &d, &default_context_); req.Start(); base::RunLoop().Run(); @@ -1228,7 +1236,10 @@ TEST_F(URLRequestTest, Intercept) { interceptor.main_data_ = TestInterceptor::ok_data(); TestDelegate d; - URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_); + URLRequest req(GURL("http://test_intercept/foo"), + DEFAULT_PRIORITY, + &d, + &default_context_); base::SupportsUserData::Data* user_data0 = new base::SupportsUserData::Data(); base::SupportsUserData::Data* user_data1 = new base::SupportsUserData::Data(); base::SupportsUserData::Data* user_data2 = new base::SupportsUserData::Data(); @@ -1269,7 +1280,10 @@ TEST_F(URLRequestTest, InterceptRedirect) { interceptor.redirect_data_ = TestInterceptor::ok_data(); TestDelegate d; - URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_); + URLRequest req(GURL("http://test_intercept/foo"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.set_method("GET"); req.Start(); base::RunLoop().Run(); @@ -1302,7 +1316,10 @@ TEST_F(URLRequestTest, InterceptServerError) { interceptor.final_data_ = TestInterceptor::ok_data(); TestDelegate d; - URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_); + URLRequest req(GURL("http://test_intercept/foo"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.set_method("GET"); req.Start(); base::RunLoop().Run(); @@ -1331,7 +1348,10 @@ TEST_F(URLRequestTest, InterceptNetworkError) { interceptor.final_data_ = TestInterceptor::ok_data(); TestDelegate d; - URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_); + URLRequest req(GURL("http://test_intercept/foo"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.set_method("GET"); req.Start(); base::RunLoop().Run(); @@ -1360,7 +1380,10 @@ TEST_F(URLRequestTest, InterceptRestartRequired) { interceptor.main_data_ = TestInterceptor::ok_data(); TestDelegate d; - URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_); + URLRequest req(GURL("http://test_intercept/foo"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.set_method("GET"); req.Start(); base::RunLoop().Run(); @@ -1391,7 +1414,10 @@ TEST_F(URLRequestTest, InterceptRespectsCancelMain) { interceptor.final_data_ = TestInterceptor::ok_data(); TestDelegate d; - URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_); + URLRequest req(GURL("http://test_intercept/foo"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.set_method("GET"); req.Start(); base::RunLoop().Run(); @@ -1422,7 +1448,10 @@ TEST_F(URLRequestTest, InterceptRespectsCancelRedirect) { interceptor.final_data_ = TestInterceptor::ok_data(); TestDelegate d; - URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_); + URLRequest req(GURL("http://test_intercept/foo"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.set_method("GET"); req.Start(); base::RunLoop().Run(); @@ -1447,7 +1476,10 @@ TEST_F(URLRequestTest, InterceptRespectsCancelFinal) { interceptor.cancel_final_request_ = true; TestDelegate d; - URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_); + URLRequest req(GURL("http://test_intercept/foo"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.set_method("GET"); req.Start(); base::RunLoop().Run(); @@ -1473,7 +1505,10 @@ TEST_F(URLRequestTest, InterceptRespectsCancelInRestart) { interceptor.final_data_ = TestInterceptor::ok_data(); TestDelegate d; - URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_); + URLRequest req(GURL("http://test_intercept/foo"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.set_method("GET"); req.Start(); base::RunLoop().Run(); @@ -1493,7 +1528,8 @@ LoadTimingInfo RunLoadTimingTest(const LoadTimingInfo& job_load_timing, interceptor.intercept_main_request_ = true; interceptor.main_request_load_timing_info_ = job_load_timing; TestDelegate d; - URLRequest req(GURL("http://test_intercept/foo"), &d, context); + URLRequest req( + GURL("http://test_intercept/foo"), DEFAULT_PRIORITY, &d, context); req.Start(); base::RunLoop().Run(); @@ -1567,8 +1603,8 @@ TEST_F(URLRequestTest, InterceptLoadTiming) { LoadTimingInfo job_load_timing = NormalLoadTimingInfo(now, CONNECT_TIMING_HAS_DNS_TIMES, false); - LoadTimingInfo load_timing_result = RunLoadTimingTest(job_load_timing, - &default_context_); + LoadTimingInfo load_timing_result = + RunLoadTimingTest(job_load_timing, &default_context_); // Nothing should have been changed by the URLRequest. EXPECT_EQ(job_load_timing.proxy_resolve_start, @@ -1598,8 +1634,8 @@ TEST_F(URLRequestTest, InterceptLoadTimingProxy) { LoadTimingInfo job_load_timing = NormalLoadTimingInfo(now, CONNECT_TIMING_HAS_SSL_TIMES, true); - LoadTimingInfo load_timing_result = RunLoadTimingTest(job_load_timing, - &default_context_); + LoadTimingInfo load_timing_result = + RunLoadTimingTest(job_load_timing, &default_context_); // Nothing should have been changed by the URLRequest. EXPECT_EQ(job_load_timing.proxy_resolve_start, @@ -1643,8 +1679,8 @@ TEST_F(URLRequestTest, InterceptLoadTimingEarlyProxyResolution) { job_load_timing.connect_timing.connect_end = now - base::TimeDelta::FromDays(1); - LoadTimingInfo load_timing_result = RunLoadTimingTest(job_load_timing, - &default_context_); + LoadTimingInfo load_timing_result = + RunLoadTimingTest(job_load_timing, &default_context_); // Proxy times, connect times, and DNS times should all be replaced with // request_start. @@ -1673,8 +1709,8 @@ TEST_F(URLRequestTest, InterceptLoadTimingEarlyProxyResolutionReused) { job_load_timing.proxy_resolve_start = now - base::TimeDelta::FromDays(4); job_load_timing.proxy_resolve_end = now - base::TimeDelta::FromDays(3); - LoadTimingInfo load_timing_result = RunLoadTimingTest(job_load_timing, - &default_context_); + LoadTimingInfo load_timing_result = + RunLoadTimingTest(job_load_timing, &default_context_); // Proxy times and connect times should all be replaced with request_start. EXPECT_EQ(load_timing_result.request_start, @@ -1702,8 +1738,8 @@ TEST_F(URLRequestTest, InterceptLoadTimingEarlyConnect) { job_load_timing.connect_timing.connect_end = now - base::TimeDelta::FromDays(4); - LoadTimingInfo load_timing_result = RunLoadTimingTest(job_load_timing, - &default_context_); + LoadTimingInfo load_timing_result = + RunLoadTimingTest(job_load_timing, &default_context_); // Connect times, and SSL times should be replaced with request_start. EXPECT_EQ(load_timing_result.request_start, @@ -1734,8 +1770,8 @@ TEST_F(URLRequestTest, InterceptLoadTimingEarlyConnectWithProxy) { job_load_timing.connect_timing.connect_end = now - base::TimeDelta::FromDays(2); - LoadTimingInfo load_timing_result = RunLoadTimingTest(job_load_timing, - &default_context_); + LoadTimingInfo load_timing_result = + RunLoadTimingTest(job_load_timing, &default_context_); // Connect times should be replaced with proxy_resolve_end. EXPECT_EQ(load_timing_result.proxy_resolve_end, @@ -1752,8 +1788,10 @@ TEST_F(URLRequestTest, InterceptLoadTimingEarlyConnectWithProxy) { TEST_F(URLRequestTest, Identifiers) { TestDelegate d; TestURLRequestContext context; - TestURLRequest req(GURL("http://example.com"), &d, &context, NULL); - TestURLRequest other_req(GURL("http://example.com"), &d, &context, NULL); + TestURLRequest req( + GURL("http://example.com"), DEFAULT_PRIORITY, &d, &context); + TestURLRequest other_req( + GURL("http://example.com"), DEFAULT_PRIORITY, &d, &context); ASSERT_NE(req.identifier(), other_req.identifier()); } @@ -1768,7 +1806,7 @@ TEST_F(URLRequestTest, NetworkDelegateProxyError) { TestURLRequestContextWithProxy context("myproxy:70", &network_delegate); TestDelegate d; - URLRequest req(GURL("http://example.com"), &d, &context); + URLRequest req(GURL("http://example.com"), DEFAULT_PRIORITY, &d, &context); req.set_method("GET"); req.Start(); @@ -1788,7 +1826,7 @@ TEST_F(URLRequestTest, NetworkDelegateProxyError) { // content is empty. TEST_F(URLRequestTest, RequestCompletionForEmptyResponse) { TestDelegate d; - URLRequest req(GURL("data:,"), &d, &default_context_); + URLRequest req(GURL("data:,"), DEFAULT_PRIORITY, &d, &default_context_); req.Start(); base::RunLoop().Run(); EXPECT_EQ("", d.data_received()); @@ -1799,7 +1837,10 @@ TEST_F(URLRequestTest, RequestCompletionForEmptyResponse) { // correctly, both before and after start. TEST_F(URLRequestTest, SetPriorityBasic) { TestDelegate d; - URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_); + URLRequest req(GURL("http://test_intercept/foo"), + DEFAULT_PRIORITY, + &d, + &default_context_); EXPECT_EQ(DEFAULT_PRIORITY, req.priority()); req.SetPriority(LOW); @@ -1816,7 +1857,10 @@ TEST_F(URLRequestTest, SetPriorityBasic) { // Start on it. TEST_F(URLRequestTest, SetJobPriorityBeforeJobStart) { TestDelegate d; - URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_); + URLRequest req(GURL("http://test_intercept/foo"), + DEFAULT_PRIORITY, + &d, + &default_context_); EXPECT_EQ(DEFAULT_PRIORITY, req.priority()); scoped_refptr<URLRequestTestJob> job = @@ -1834,7 +1878,10 @@ TEST_F(URLRequestTest, SetJobPriorityBeforeJobStart) { // job. TEST_F(URLRequestTest, SetJobPriority) { TestDelegate d; - URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_); + URLRequest req(GURL("http://test_intercept/foo"), + DEFAULT_PRIORITY, + &d, + &default_context_); scoped_refptr<URLRequestTestJob> job = new URLRequestTestJob(&req, &default_network_delegate_); @@ -1881,8 +1928,10 @@ TEST_F(URLRequestTest, DelayedCookieCallback) { TestNetworkDelegate network_delegate; context.set_network_delegate(&network_delegate); TestDelegate d; - URLRequest req( - test_server.GetURL("set-cookie?CookieToNotSend=1"), &d, &context); + URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"), + DEFAULT_PRIORITY, + &d, + &context); req.Start(); base::RunLoop().Run(); EXPECT_EQ(0, network_delegate.blocked_get_cookies_count()); @@ -1895,7 +1944,10 @@ TEST_F(URLRequestTest, DelayedCookieCallback) { TestNetworkDelegate network_delegate; context.set_network_delegate(&network_delegate); TestDelegate d; - URLRequest req(test_server.GetURL("echoheader?Cookie"), &d, &context); + URLRequest req(test_server.GetURL("echoheader?Cookie"), + DEFAULT_PRIORITY, + &d, + &context); req.Start(); base::RunLoop().Run(); @@ -1916,6 +1968,7 @@ TEST_F(URLRequestTest, DoNotSendCookies) { default_context_.set_network_delegate(&network_delegate); TestDelegate d; URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"), + DEFAULT_PRIORITY, &d, &default_context_); req.Start(); @@ -1929,8 +1982,10 @@ TEST_F(URLRequestTest, DoNotSendCookies) { TestNetworkDelegate network_delegate; default_context_.set_network_delegate(&network_delegate); TestDelegate d; - URLRequest req( - test_server.GetURL("echoheader?Cookie"), &d, &default_context_); + URLRequest req(test_server.GetURL("echoheader?Cookie"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.Start(); base::RunLoop().Run(); @@ -1945,8 +2000,10 @@ TEST_F(URLRequestTest, DoNotSendCookies) { TestNetworkDelegate network_delegate; default_context_.set_network_delegate(&network_delegate); TestDelegate d; - URLRequest req( - test_server.GetURL("echoheader?Cookie"), &d, &default_context_); + URLRequest req(test_server.GetURL("echoheader?Cookie"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.set_load_flags(LOAD_DO_NOT_SEND_COOKIES); req.Start(); base::RunLoop().Run(); @@ -1970,6 +2027,7 @@ TEST_F(URLRequestTest, DoNotSaveCookies) { default_context_.set_network_delegate(&network_delegate); TestDelegate d; URLRequest req(test_server.GetURL("set-cookie?CookieToNotUpdate=2"), + DEFAULT_PRIORITY, &d, &default_context_); req.Start(); @@ -1987,6 +2045,7 @@ TEST_F(URLRequestTest, DoNotSaveCookies) { TestDelegate d; URLRequest req( test_server.GetURL("set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"), + DEFAULT_PRIORITY, &d, &default_context_); req.set_load_flags(LOAD_DO_NOT_SAVE_COOKIES); @@ -2005,8 +2064,10 @@ TEST_F(URLRequestTest, DoNotSaveCookies) { TestNetworkDelegate network_delegate; default_context_.set_network_delegate(&network_delegate); TestDelegate d; - URLRequest req( - test_server.GetURL("echoheader?Cookie"), &d, &default_context_); + URLRequest req(test_server.GetURL("echoheader?Cookie"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.Start(); base::RunLoop().Run(); @@ -2031,6 +2092,7 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy) { default_context_.set_network_delegate(&network_delegate); TestDelegate d; URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"), + DEFAULT_PRIORITY, &d, &default_context_); req.Start(); @@ -2045,8 +2107,10 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy) { TestNetworkDelegate network_delegate; default_context_.set_network_delegate(&network_delegate); TestDelegate d; - URLRequest req( - test_server.GetURL("echoheader?Cookie"), &d, &default_context_); + URLRequest req(test_server.GetURL("echoheader?Cookie"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.Start(); base::RunLoop().Run(); @@ -2063,8 +2127,10 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy) { default_context_.set_network_delegate(&network_delegate); TestDelegate d; network_delegate.set_cookie_options(TestNetworkDelegate::NO_GET_COOKIES); - URLRequest req( - test_server.GetURL("echoheader?Cookie"), &d, &default_context_); + URLRequest req(test_server.GetURL("echoheader?Cookie"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.Start(); base::RunLoop().Run(); @@ -2086,6 +2152,7 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy) { default_context_.set_network_delegate(&network_delegate); TestDelegate d; URLRequest req(test_server.GetURL("set-cookie?CookieToNotUpdate=2"), + DEFAULT_PRIORITY, &d, &default_context_); req.Start(); @@ -2103,6 +2170,7 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy) { network_delegate.set_cookie_options(TestNetworkDelegate::NO_SET_COOKIE); URLRequest req( test_server.GetURL("set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"), + DEFAULT_PRIORITY, &d, &default_context_); req.Start(); @@ -2118,8 +2186,10 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy) { TestNetworkDelegate network_delegate; default_context_.set_network_delegate(&network_delegate); TestDelegate d; - URLRequest req( - test_server.GetURL("echoheader?Cookie"), &d, &default_context_); + URLRequest req(test_server.GetURL("echoheader?Cookie"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.Start(); base::RunLoop().Run(); @@ -2142,7 +2212,10 @@ TEST_F(URLRequestTest, DoNotSaveEmptyCookies) { TestNetworkDelegate network_delegate; default_context_.set_network_delegate(&network_delegate); TestDelegate d; - URLRequest req(test_server.GetURL("set-cookie"), &d, &default_context_); + URLRequest req(test_server.GetURL("set-cookie"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.Start(); base::RunLoop().Run(); @@ -2162,6 +2235,7 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy_Async) { default_context_.set_network_delegate(&network_delegate); TestDelegate d; URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"), + DEFAULT_PRIORITY, &d, &default_context_); req.Start(); @@ -2176,8 +2250,10 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy_Async) { TestNetworkDelegate network_delegate; default_context_.set_network_delegate(&network_delegate); TestDelegate d; - URLRequest req( - test_server.GetURL("echoheader?Cookie"), &d, &default_context_); + URLRequest req(test_server.GetURL("echoheader?Cookie"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.Start(); base::RunLoop().Run(); @@ -2194,8 +2270,10 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy_Async) { default_context_.set_network_delegate(&network_delegate); TestDelegate d; network_delegate.set_cookie_options(TestNetworkDelegate::NO_GET_COOKIES); - URLRequest req( - test_server.GetURL("echoheader?Cookie"), &d, &default_context_); + URLRequest req(test_server.GetURL("echoheader?Cookie"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.Start(); base::RunLoop().Run(); @@ -2217,6 +2295,7 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy_Async) { default_context_.set_network_delegate(&network_delegate); TestDelegate d; URLRequest req(test_server.GetURL("set-cookie?CookieToNotUpdate=2"), + DEFAULT_PRIORITY, &d, &default_context_); req.Start(); @@ -2234,6 +2313,7 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy_Async) { network_delegate.set_cookie_options(TestNetworkDelegate::NO_SET_COOKIE); URLRequest req( test_server.GetURL("set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"), + DEFAULT_PRIORITY, &d, &default_context_); req.Start(); @@ -2249,8 +2329,10 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy_Async) { TestNetworkDelegate network_delegate; default_context_.set_network_delegate(&network_delegate); TestDelegate d; - URLRequest req( - test_server.GetURL("echoheader?Cookie"), &d, &default_context_); + URLRequest req(test_server.GetURL("echoheader?Cookie"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.Start(); base::RunLoop().Run(); @@ -2316,8 +2398,10 @@ TEST_F(URLRequestTest, AcceptClockSkewCookieWithWrongDateTimezone) { TestNetworkDelegate network_delegate; default_context_.set_network_delegate(&network_delegate); TestDelegate d; - URLRequest req(test_server.GetURL( - "set-cookie?StillGood=1;expires=Mon,18-Apr-1977,22:50:13,GMT"), + URLRequest req( + test_server.GetURL( + "set-cookie?StillGood=1;expires=Mon,18-Apr-1977,22:50:13,GMT"), + DEFAULT_PRIORITY, &d, &default_context_); req.Start(); @@ -2328,8 +2412,10 @@ TEST_F(URLRequestTest, AcceptClockSkewCookieWithWrongDateTimezone) { TestNetworkDelegate network_delegate; default_context_.set_network_delegate(&network_delegate); TestDelegate d; - URLRequest req( - test_server.GetURL("echoheader?Cookie"), &d, &default_context_); + URLRequest req(test_server.GetURL("echoheader?Cookie"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.Start(); base::RunLoop().Run(); @@ -2340,8 +2426,10 @@ TEST_F(URLRequestTest, AcceptClockSkewCookieWithWrongDateTimezone) { FixedDateNetworkDelegate network_delegate("18-Apr-1977 22:49:13 UTC"); default_context_.set_network_delegate(&network_delegate); TestDelegate d; - URLRequest req(test_server.GetURL( - "set-cookie?StillGood=1;expires=Mon,18-Apr-1977,22:50:13,GMT"), + URLRequest req( + test_server.GetURL( + "set-cookie?StillGood=1;expires=Mon,18-Apr-1977,22:50:13,GMT"), + DEFAULT_PRIORITY, &d, &default_context_); req.Start(); @@ -2352,8 +2440,10 @@ TEST_F(URLRequestTest, AcceptClockSkewCookieWithWrongDateTimezone) { TestNetworkDelegate network_delegate; default_context_.set_network_delegate(&network_delegate); TestDelegate d; - URLRequest req( - test_server.GetURL("echoheader?Cookie"), &d, &default_context_); + URLRequest req(test_server.GetURL("echoheader?Cookie"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.Start(); base::RunLoop().Run(); @@ -2372,8 +2462,10 @@ TEST_F(URLRequestTest, DoNotOverrideReferrer) { // only the latter shall be respected. { TestDelegate d; - URLRequest req( - test_server.GetURL("echoheader?Referer"), &d, &default_context_); + URLRequest req(test_server.GetURL("echoheader?Referer"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.SetReferrer("http://foo.com/"); HttpRequestHeaders headers; @@ -2390,8 +2482,10 @@ TEST_F(URLRequestTest, DoNotOverrideReferrer) { // shall be sent in the header. { TestDelegate d; - URLRequest req( - test_server.GetURL("echoheader?Referer"), &d, &default_context_); + URLRequest req(test_server.GetURL("echoheader?Referer"), + DEFAULT_PRIORITY, + &d, + &default_context_); HttpRequestHeaders headers; headers.SetHeader(HttpRequestHeaders::kReferer, "http://bar.com/"); @@ -2426,7 +2520,7 @@ class URLRequestTestHTTP : public URLRequestTest { bool include_data) { static const char kData[] = "hello world"; TestDelegate d; - URLRequest req(redirect_url, &d, &default_context_); + URLRequest req(redirect_url, DEFAULT_PRIORITY, &d, &default_context_); req.set_method(request_method); if (include_data) { req.set_upload(make_scoped_ptr(CreateSimpleUploadData(kData))); @@ -2471,7 +2565,8 @@ class URLRequestTestHTTP : public URLRequestTest { for (int i = 0; i < kIterations; ++i) { TestDelegate d; - URLRequest r(test_server_.GetURL("echo"), &d, &default_context_); + URLRequest r( + test_server_.GetURL("echo"), DEFAULT_PRIORITY, &d, &default_context_); r.set_method(method.c_str()); r.set_upload(make_scoped_ptr(CreateSimpleUploadData(uploadBytes))); @@ -2519,8 +2614,9 @@ class URLRequestTestHTTP : public URLRequestTest { TestDelegate d; URLRequest r(test_server_.GetURL("set-many-cookies?" + base::IntToString(num_cookies)), - &d, - &default_context_); + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -2555,12 +2651,12 @@ TEST_F(URLRequestTestHTTP, ProxyTunnelRedirectTest) { TestNetworkDelegate network_delegate; // Must outlive URLRequest. TestURLRequestContextWithProxy context( - test_server_.host_port_pair().ToString(), - &network_delegate); + test_server_.host_port_pair().ToString(), &network_delegate); TestDelegate d; { - URLRequest r(GURL("https://www.redirect.com/"), &d, &context); + URLRequest r( + GURL("https://www.redirect.com/"), DEFAULT_PRIORITY, &d, &context); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -2581,12 +2677,12 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateTunnelConnectionFailed) { TestNetworkDelegate network_delegate; // Must outlive URLRequest. TestURLRequestContextWithProxy context( - test_server_.host_port_pair().ToString(), - &network_delegate); + test_server_.host_port_pair().ToString(), &network_delegate); TestDelegate d; { - URLRequest r(GURL("https://www.redirect.com/"), &d, &context); + URLRequest r( + GURL("https://www.redirect.com/"), DEFAULT_PRIORITY, &d, &context); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -2627,7 +2723,8 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateBlockAsynchronously) { context.Init(); { - URLRequest r(test_server_.GetURL("empty.html"), &d, &context); + URLRequest r( + test_server_.GetURL("empty.html"), DEFAULT_PRIORITY, &d, &context); r.Start(); for (size_t i = 0; i < blocking_stages_length; ++i) { @@ -2656,11 +2753,11 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateCancelRequest) { network_delegate.set_retval(ERR_EMPTY_RESPONSE); TestURLRequestContextWithProxy context( - test_server_.host_port_pair().ToString(), - &network_delegate); + test_server_.host_port_pair().ToString(), &network_delegate); { - URLRequest r(test_server_.GetURL(std::string()), &d, &context); + URLRequest r( + test_server_.GetURL(std::string()), DEFAULT_PRIORITY, &d, &context); r.Start(); base::RunLoop().Run(); @@ -2690,7 +2787,7 @@ void NetworkDelegateCancelRequest(BlockingNetworkDelegate::BlockMode block_mode, context.Init(); { - URLRequest r(url, &d, &context); + URLRequest r(url, DEFAULT_PRIORITY, &d, &context); r.Start(); base::RunLoop().Run(); @@ -2762,12 +2859,11 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateRedirectRequest) { network_delegate.set_redirect_url(redirect_url); TestURLRequestContextWithProxy context( - test_server_.host_port_pair().ToString(), - &network_delegate); + test_server_.host_port_pair().ToString(), &network_delegate); { GURL original_url(test_server_.GetURL("empty.html")); - URLRequest r(original_url, &d, &context); + URLRequest r(original_url, DEFAULT_PRIORITY, &d, &context); r.Start(); base::RunLoop().Run(); @@ -2795,12 +2891,11 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateRedirectRequestSynchronously) { network_delegate.set_redirect_url(redirect_url); TestURLRequestContextWithProxy context( - test_server_.host_port_pair().ToString(), - &network_delegate); + test_server_.host_port_pair().ToString(), &network_delegate); { GURL original_url(test_server_.GetURL("empty.html")); - URLRequest r(original_url, &d, &context); + URLRequest r(original_url, DEFAULT_PRIORITY, &d, &context); r.Start(); base::RunLoop().Run(); @@ -2835,7 +2930,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateRedirectRequestPost) { { GURL original_url(test_server_.GetURL("empty.html")); - URLRequest r(original_url, &d, &context); + URLRequest r(original_url, DEFAULT_PRIORITY, &d, &context); r.set_method("POST"); r.set_upload(make_scoped_ptr(CreateSimpleUploadData(kData))); HttpRequestHeaders headers; @@ -2877,7 +2972,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateOnAuthRequiredSyncNoAction) { { GURL url(test_server_.GetURL("auth-basic")); - URLRequest r(url, &d, &context); + URLRequest r(url, DEFAULT_PRIORITY, &d, &context); r.Start(); base::RunLoop().Run(); @@ -2908,7 +3003,7 @@ TEST_F(URLRequestTestHTTP, { GURL url(test_server_.GetURL("auth-basic")); - URLRequest r(url, &d, &context); + URLRequest r(url, DEFAULT_PRIORITY, &d, &context); r.Start(); { @@ -2949,7 +3044,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateOnAuthRequiredSyncSetAuth) { { GURL url(test_server_.GetURL("auth-basic")); - URLRequest r(url, &d, &context); + URLRequest r(url, DEFAULT_PRIORITY, &d, &context); r.Start(); base::RunLoop().Run(); @@ -2984,7 +3079,7 @@ TEST_F(URLRequestTestHTTP, { GURL url(test_server_.GetURL("auth-basic")); - URLRequest r(url, &d, &context); + URLRequest r(url, DEFAULT_PRIORITY, &d, &context); r.Start(); base::RunLoop().Run(); @@ -3022,7 +3117,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateOnAuthRequiredSyncCancel) { { GURL url(test_server_.GetURL("auth-basic")); - URLRequest r(url, &d, &context); + URLRequest r(url, DEFAULT_PRIORITY, &d, &context); r.Start(); base::RunLoop().Run(); @@ -3056,7 +3151,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateOnAuthRequiredAsyncNoAction) { { GURL url(test_server_.GetURL("auth-basic")); - URLRequest r(url, &d, &context); + URLRequest r(url, DEFAULT_PRIORITY, &d, &context); r.Start(); base::RunLoop().Run(); @@ -3091,7 +3186,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateOnAuthRequiredAsyncSetAuth) { { GURL url(test_server_.GetURL("auth-basic")); - URLRequest r(url, &d, &context); + URLRequest r(url, DEFAULT_PRIORITY, &d, &context); r.Start(); base::RunLoop().Run(); @@ -3124,7 +3219,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateOnAuthRequiredAsyncCancel) { { GURL url(test_server_.GetURL("auth-basic")); - URLRequest r(url, &d, &context); + URLRequest r(url, DEFAULT_PRIORITY, &d, &context); r.Start(); base::RunLoop().Run(); @@ -3154,7 +3249,8 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateCancelWhileWaiting1) { context.Init(); { - URLRequest r(test_server_.GetURL(std::string()), &d, &context); + URLRequest r( + test_server_.GetURL(std::string()), DEFAULT_PRIORITY, &d, &context); r.Start(); base::RunLoop().Run(); @@ -3190,7 +3286,8 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateCancelWhileWaiting2) { context.Init(); { - URLRequest r(test_server_.GetURL(std::string()), &d, &context); + URLRequest r( + test_server_.GetURL(std::string()), DEFAULT_PRIORITY, &d, &context); r.Start(); base::RunLoop().Run(); @@ -3225,7 +3322,8 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateCancelWhileWaiting3) { context.Init(); { - URLRequest r(test_server_.GetURL(std::string()), &d, &context); + URLRequest r( + test_server_.GetURL(std::string()), DEFAULT_PRIORITY, &d, &context); r.Start(); base::RunLoop().Run(); @@ -3260,7 +3358,8 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateCancelWhileWaiting4) { context.Init(); { - URLRequest r(test_server_.GetURL("auth-basic"), &d, &context); + URLRequest r( + test_server_.GetURL("auth-basic"), DEFAULT_PRIORITY, &d, &context); r.Start(); base::RunLoop().Run(); @@ -3287,12 +3386,12 @@ TEST_F(URLRequestTestHTTP, UnexpectedServerAuthTest) { TestNetworkDelegate network_delegate; // Must outlive URLRequest. TestURLRequestContextWithProxy context( - test_server_.host_port_pair().ToString(), - &network_delegate); + test_server_.host_port_pair().ToString(), &network_delegate); TestDelegate d; { - URLRequest r(GURL("https://www.server-auth.com/"), &d, &context); + URLRequest r( + GURL("https://www.server-auth.com/"), DEFAULT_PRIORITY, &d, &context); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -3309,7 +3408,10 @@ TEST_F(URLRequestTestHTTP, GetTest_NoCache) { TestDelegate d; { - URLRequest r(test_server_.GetURL(std::string()), &d, &default_context_); + URLRequest r(test_server_.GetURL(std::string()), + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -3375,7 +3477,10 @@ TEST_F(URLRequestTestHTTP, GetTest) { TestDelegate d; { - URLRequest r(test_server_.GetURL(std::string()), &d, &default_context_); + URLRequest r(test_server_.GetURL(std::string()), + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -3398,7 +3503,7 @@ TEST_F(URLRequestTestHTTP, GetTest_GetFullRequestHeaders) { TestDelegate d; { GURL test_url(test_server_.GetURL(std::string())); - URLRequest r(test_url, &d, &default_context_); + URLRequest r(test_url, DEFAULT_PRIORITY, &d, &default_context_); HttpRequestHeaders headers; EXPECT_FALSE(r.GetFullRequestHeaders(&headers)); @@ -3426,7 +3531,10 @@ TEST_F(URLRequestTestHTTP, GetTestLoadTiming) { TestDelegate d; { - URLRequest r(test_server_.GetURL(std::string()), &d, &default_context_); + URLRequest r(test_server_.GetURL(std::string()), + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -3476,7 +3584,8 @@ TEST_F(URLRequestTestHTTP, GetZippedTest) { context.set_network_delegate(&network_delegate); context.Init(); - URLRequest r(test_server_.GetURL(test_file), &d, &context); + URLRequest r( + test_server_.GetURL(test_file), DEFAULT_PRIORITY, &d, &context); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -3512,8 +3621,11 @@ TEST_F(URLRequestTestHTTP, HTTPSToHTTPRedirectNoRefererTest) { // server should not be sent the referer. GURL http_destination = test_server_.GetURL(std::string()); TestDelegate d; - URLRequest req(https_test_server.GetURL( - "server-redirect?" + http_destination.spec()), &d, &default_context_); + URLRequest req( + https_test_server.GetURL("server-redirect?" + http_destination.spec()), + DEFAULT_PRIORITY, + &d, + &default_context_); req.SetReferrer("https://www.referrer.com/"); req.Start(); base::RunLoop().Run(); @@ -3531,7 +3643,7 @@ TEST_F(URLRequestTestHTTP, RedirectLoadTiming) { GURL original_url = test_server_.GetURL("server-redirect?" + destination_url.spec()); TestDelegate d; - URLRequest req(original_url, &d, &default_context_); + URLRequest req(original_url, DEFAULT_PRIORITY, &d, &default_context_); req.Start(); base::RunLoop().Run(); @@ -3571,7 +3683,7 @@ TEST_F(URLRequestTestHTTP, MultipleRedirectTest) { GURL original_url = test_server_.GetURL( "server-redirect?" + middle_redirect_url.spec()); TestDelegate d; - URLRequest req(original_url, &d, &default_context_); + URLRequest req(original_url, DEFAULT_PRIORITY, &d, &default_context_); req.Start(); base::RunLoop().Run(); @@ -3887,7 +3999,9 @@ TEST_F(URLRequestTestHTTP, DelegateInfoBeforeStart) { { URLRequest r(test_server_.GetURL("empty.html"), - &request_delegate, &context); + DEFAULT_PRIORITY, + &request_delegate, + &context); LoadStateWithParam load_state = r.GetLoadState(); EXPECT_EQ(LOAD_STATE_IDLE, load_state.state); EXPECT_EQ(string16(), load_state.param); @@ -3933,7 +4047,9 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateInfo) { { URLRequest r(test_server_.GetURL("simple.html"), - &request_delegate, &context); + DEFAULT_PRIORITY, + &request_delegate, + &context); LoadStateWithParam load_state = r.GetLoadState(); EXPECT_EQ(LOAD_STATE_IDLE, load_state.state); EXPECT_EQ(string16(), load_state.param); @@ -3984,7 +4100,9 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateInfoRedirect) { { URLRequest r(test_server_.GetURL("server-redirect?simple.html"), - &request_delegate, &context); + DEFAULT_PRIORITY, + &request_delegate, + &context); LoadStateWithParam load_state = r.GetLoadState(); EXPECT_EQ(LOAD_STATE_IDLE, load_state.state); EXPECT_EQ(string16(), load_state.param); @@ -4060,7 +4178,9 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateInfoAuth) { { URLRequest r(test_server_.GetURL("auth-basic"), - &request_delegate, &context); + DEFAULT_PRIORITY, + &request_delegate, + &context); LoadStateWithParam load_state = r.GetLoadState(); EXPECT_EQ(LOAD_STATE_IDLE, load_state.state); EXPECT_EQ(string16(), load_state.param); @@ -4118,7 +4238,9 @@ TEST_F(URLRequestTestHTTP, URLRequestDelegateInfo) { // the possability of multiple reads being combined in the unlikely event // that it occurs. URLRequest r(test_server_.GetURL("chunked?waitBetweenChunks=20"), - &request_delegate, &context); + DEFAULT_PRIORITY, + &request_delegate, + &context); LoadStateWithParam load_state = r.GetLoadState(); r.Start(); base::RunLoop().Run(); @@ -4166,7 +4288,9 @@ TEST_F(URLRequestTestHTTP, URLRequestDelegateInfoOnRedirect) { { URLRequest r(test_server_.GetURL("server-redirect?simple.html"), - &request_delegate, &context); + DEFAULT_PRIORITY, + &request_delegate, + &context); LoadStateWithParam load_state = r.GetLoadState(); r.Start(); base::RunLoop().Run(); @@ -4224,7 +4348,9 @@ TEST_F(URLRequestTestHTTP, URLRequestDelegateOnRedirectCancelled) { { URLRequest r(test_server_.GetURL("server-redirect?simple.html"), - &request_delegate, &context); + DEFAULT_PRIORITY, + &request_delegate, + &context); LoadStateWithParam load_state = r.GetLoadState(); r.Start(); base::RunLoop().Run(); @@ -4285,7 +4411,7 @@ TEST_F(URLRequestTestHTTP, RedirectWithAdditionalHeadersTest) { GURL original_url = test_server_.GetURL( "server-redirect?" + destination_url.spec()); RedirectWithAdditionalHeadersDelegate d; - URLRequest req(original_url, &d, &default_context_); + URLRequest req(original_url, DEFAULT_PRIORITY, &d, &default_context_); req.Start(); base::RunLoop().Run(); @@ -4321,7 +4447,7 @@ TEST_F(URLRequestTestHTTP, RedirectWithHeaderRemovalTest) { GURL original_url = test_server_.GetURL( "server-redirect?" + destination_url.spec()); RedirectWithHeaderRemovalDelegate d; - URLRequest req(original_url, &d, &default_context_); + URLRequest req(original_url, DEFAULT_PRIORITY, &d, &default_context_); req.SetExtraRequestHeaderByName(kExtraHeaderToRemove, "dummy", false); req.Start(); base::RunLoop().Run(); @@ -4337,7 +4463,10 @@ TEST_F(URLRequestTestHTTP, RedirectWithHeaderRemovalTest) { TEST_F(URLRequestTestHTTP, CancelTest) { TestDelegate d; { - URLRequest r(GURL("http://www.google.com/"), &d, &default_context_); + URLRequest r(GURL("http://www.google.com/"), + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -4359,7 +4488,10 @@ TEST_F(URLRequestTestHTTP, CancelTest2) { TestDelegate d; { - URLRequest r(test_server_.GetURL(std::string()), &d, &default_context_); + URLRequest r(test_server_.GetURL(std::string()), + DEFAULT_PRIORITY, + &d, + &default_context_); d.set_cancel_in_response_started(true); @@ -4380,7 +4512,10 @@ TEST_F(URLRequestTestHTTP, CancelTest3) { TestDelegate d; { - URLRequest r(test_server_.GetURL(std::string()), &d, &default_context_); + URLRequest r(test_server_.GetURL(std::string()), + DEFAULT_PRIORITY, + &d, + &default_context_); d.set_cancel_in_received_data(true); @@ -4404,7 +4539,10 @@ TEST_F(URLRequestTestHTTP, CancelTest4) { TestDelegate d; { - URLRequest r(test_server_.GetURL(std::string()), &d, &default_context_); + URLRequest r(test_server_.GetURL(std::string()), + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -4430,7 +4568,10 @@ TEST_F(URLRequestTestHTTP, CancelTest5) { // populate cache { TestDelegate d; - URLRequest r(test_server_.GetURL("cachetime"), &d, &default_context_); + URLRequest r(test_server_.GetURL("cachetime"), + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); base::RunLoop().Run(); EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status()); @@ -4439,7 +4580,10 @@ TEST_F(URLRequestTestHTTP, CancelTest5) { // cancel read from cache (see bug 990242) { TestDelegate d; - URLRequest r(test_server_.GetURL("cachetime"), &d, &default_context_); + URLRequest r(test_server_.GetURL("cachetime"), + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); r.Cancel(); base::RunLoop().Run(); @@ -4466,7 +4610,8 @@ TEST_F(URLRequestTestHTTP, PostEmptyTest) { TestDelegate d; { - URLRequest r(test_server_.GetURL("echo"), &d, &default_context_); + URLRequest r( + test_server_.GetURL("echo"), DEFAULT_PRIORITY, &d, &default_context_); r.set_method("POST"); r.Start(); @@ -4488,7 +4633,8 @@ TEST_F(URLRequestTestHTTP, PostFileTest) { TestDelegate d; { - URLRequest r(test_server_.GetURL("echo"), &d, &default_context_); + URLRequest r( + test_server_.GetURL("echo"), DEFAULT_PRIORITY, &d, &default_context_); r.set_method("POST"); base::FilePath dir; @@ -4548,7 +4694,8 @@ TEST_F(URLRequestTestHTTP, TestPostChunkedDataBeforeStart) { TestDelegate d; { - URLRequest r(test_server_.GetURL("echo"), &d, &default_context_); + URLRequest r( + test_server_.GetURL("echo"), DEFAULT_PRIORITY, &d, &default_context_); r.EnableChunkedUpload(); r.set_method("POST"); AddChunksToUpload(&r); @@ -4566,7 +4713,8 @@ TEST_F(URLRequestTestHTTP, TestPostChunkedDataJustAfterStart) { TestDelegate d; { - URLRequest r(test_server_.GetURL("echo"), &d, &default_context_); + URLRequest r( + test_server_.GetURL("echo"), DEFAULT_PRIORITY, &d, &default_context_); r.EnableChunkedUpload(); r.set_method("POST"); r.Start(); @@ -4583,7 +4731,8 @@ TEST_F(URLRequestTestHTTP, TestPostChunkedDataAfterStart) { TestDelegate d; { - URLRequest r(test_server_.GetURL("echo"), &d, &default_context_); + URLRequest r( + test_server_.GetURL("echo"), DEFAULT_PRIORITY, &d, &default_context_); r.EnableChunkedUpload(); r.set_method("POST"); r.Start(); @@ -4601,8 +4750,10 @@ TEST_F(URLRequestTestHTTP, ResponseHeadersTest) { ASSERT_TRUE(test_server_.Start()); TestDelegate d; - URLRequest req( - test_server_.GetURL("files/with-headers.html"), &d, &default_context_); + URLRequest req(test_server_.GetURL("files/with-headers.html"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.Start(); base::RunLoop().Run(); @@ -4635,10 +4786,10 @@ TEST_F(URLRequestTestHTTP, ProcessSTS) { ASSERT_TRUE(https_test_server.Start()); TestDelegate d; - URLRequest request( - https_test_server.GetURL("files/hsts-headers.html"), - &d, - &default_context_); + URLRequest request(https_test_server.GetURL("files/hsts-headers.html"), + DEFAULT_PRIORITY, + &d, + &default_context_); request.Start(); base::RunLoop().Run(); @@ -4679,10 +4830,10 @@ TEST_F(URLRequestTestHTTP, MAYBE_ProcessPKP) { ASSERT_TRUE(https_test_server.Start()); TestDelegate d; - URLRequest request( - https_test_server.GetURL("files/hpkp-headers.html"), - &d, - &default_context_); + URLRequest request(https_test_server.GetURL("files/hpkp-headers.html"), + DEFAULT_PRIORITY, + &d, + &default_context_); request.Start(); base::RunLoop().Run(); @@ -4712,6 +4863,7 @@ TEST_F(URLRequestTestHTTP, ProcessSTSOnce) { TestDelegate d; URLRequest request( https_test_server.GetURL("files/hsts-multiple-headers.html"), + DEFAULT_PRIORITY, &d, &default_context_); request.Start(); @@ -4741,6 +4893,7 @@ TEST_F(URLRequestTestHTTP, ProcessSTSAndPKP) { TestDelegate d; URLRequest request( https_test_server.GetURL("files/hsts-and-hpkp-headers.html"), + DEFAULT_PRIORITY, &d, &default_context_); request.Start(); @@ -4783,6 +4936,7 @@ TEST_F(URLRequestTestHTTP, ProcessSTSAndPKP2) { TestDelegate d; URLRequest request( https_test_server.GetURL("files/hsts-and-hpkp-headers2.html"), + DEFAULT_PRIORITY, &d, &default_context_); request.Start(); @@ -4812,8 +4966,10 @@ TEST_F(URLRequestTestHTTP, ContentTypeNormalizationTest) { ASSERT_TRUE(test_server_.Start()); TestDelegate d; - URLRequest req(test_server_.GetURL( - "files/content-type-normalization.html"), &d, &default_context_); + URLRequest req(test_server_.GetURL("files/content-type-normalization.html"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.Start(); base::RunLoop().Run(); @@ -4845,8 +5001,10 @@ TEST_F(URLRequestTestHTTP, RestrictFileRedirects) { ASSERT_TRUE(test_server_.Start()); TestDelegate d; - URLRequest req(test_server_.GetURL( - "files/redirect-to-file.html"), &d, &default_context_); + URLRequest req(test_server_.GetURL("files/redirect-to-file.html"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.Start(); base::RunLoop().Run(); @@ -4858,8 +5016,10 @@ TEST_F(URLRequestTestHTTP, RestrictDataRedirects) { ASSERT_TRUE(test_server_.Start()); TestDelegate d; - URLRequest req(test_server_.GetURL( - "files/redirect-to-data.html"), &d, &default_context_); + URLRequest req(test_server_.GetURL("files/redirect-to-data.html"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.Start(); base::MessageLoop::current()->Run(); @@ -4871,8 +5031,10 @@ TEST_F(URLRequestTestHTTP, RedirectToInvalidURL) { ASSERT_TRUE(test_server_.Start()); TestDelegate d; - URLRequest req(test_server_.GetURL( - "files/redirect-to-invalid-url.html"), &d, &default_context_); + URLRequest req(test_server_.GetURL("files/redirect-to-invalid-url.html"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.Start(); base::RunLoop().Run(); @@ -4884,8 +5046,10 @@ TEST_F(URLRequestTestHTTP, NoUserPassInReferrer) { ASSERT_TRUE(test_server_.Start()); TestDelegate d; - URLRequest req( - test_server_.GetURL("echoheader?Referer"), &d, &default_context_); + URLRequest req(test_server_.GetURL("echoheader?Referer"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.SetReferrer("http://user:pass@foo.com/"); req.Start(); base::RunLoop().Run(); @@ -4897,8 +5061,10 @@ TEST_F(URLRequestTestHTTP, NoFragmentInReferrer) { ASSERT_TRUE(test_server_.Start()); TestDelegate d; - URLRequest req( - test_server_.GetURL("echoheader?Referer"), &d, &default_context_); + URLRequest req(test_server_.GetURL("echoheader?Referer"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.SetReferrer("http://foo.com/test#fragment"); req.Start(); base::RunLoop().Run(); @@ -4910,8 +5076,10 @@ TEST_F(URLRequestTestHTTP, EmptyReferrerAfterValidReferrer) { ASSERT_TRUE(test_server_.Start()); TestDelegate d; - URLRequest req( - test_server_.GetURL("echoheader?Referer"), &d, &default_context_); + URLRequest req(test_server_.GetURL("echoheader?Referer"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.SetReferrer("http://foo.com/test#fragment"); req.SetReferrer(""); req.Start(); @@ -4926,8 +5094,10 @@ TEST_F(URLRequestTestHTTP, CancelRedirect) { TestDelegate d; { d.set_cancel_in_received_redirect(true); - URLRequest req( - test_server_.GetURL("files/redirect-test.html"), &d, &default_context_); + URLRequest req(test_server_.GetURL("files/redirect-test.html"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.Start(); base::RunLoop().Run(); @@ -4945,7 +5115,7 @@ TEST_F(URLRequestTestHTTP, DeferredRedirect) { { d.set_quit_on_redirect(true); GURL test_url(test_server_.GetURL("files/redirect-test.html")); - URLRequest req(test_url, &d, &default_context_); + URLRequest req(test_url, DEFAULT_PRIORITY, &d, &default_context_); req.Start(); base::RunLoop().Run(); @@ -4979,7 +5149,7 @@ TEST_F(URLRequestTestHTTP, DeferredRedirect_GetFullRequestHeaders) { { d.set_quit_on_redirect(true); GURL test_url(test_server_.GetURL("files/redirect-test.html")); - URLRequest req(test_url, &d, &default_context_); + URLRequest req(test_url, DEFAULT_PRIORITY, &d, &default_context_); EXPECT_FALSE(d.have_full_request_headers()); @@ -5020,8 +5190,10 @@ TEST_F(URLRequestTestHTTP, CancelDeferredRedirect) { TestDelegate d; { d.set_quit_on_redirect(true); - URLRequest req( - test_server_.GetURL("files/redirect-test.html"), &d, &default_context_); + URLRequest req(test_server_.GetURL("files/redirect-test.html"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.Start(); base::RunLoop().Run(); @@ -5043,8 +5215,10 @@ TEST_F(URLRequestTestHTTP, VaryHeader) { // Populate the cache. { TestDelegate d; - URLRequest req( - test_server_.GetURL("echoheadercache?foo"), &d, &default_context_); + URLRequest req(test_server_.GetURL("echoheadercache?foo"), + DEFAULT_PRIORITY, + &d, + &default_context_); HttpRequestHeaders headers; headers.SetHeader("foo", "1"); req.SetExtraRequestHeaders(headers); @@ -5059,8 +5233,10 @@ TEST_F(URLRequestTestHTTP, VaryHeader) { // Expect a cache hit. { TestDelegate d; - URLRequest req( - test_server_.GetURL("echoheadercache?foo"), &d, &default_context_); + URLRequest req(test_server_.GetURL("echoheadercache?foo"), + DEFAULT_PRIORITY, + &d, + &default_context_); HttpRequestHeaders headers; headers.SetHeader("foo", "1"); req.SetExtraRequestHeaders(headers); @@ -5077,8 +5253,10 @@ TEST_F(URLRequestTestHTTP, VaryHeader) { // Expect a cache miss. { TestDelegate d; - URLRequest req( - test_server_.GetURL("echoheadercache?foo"), &d, &default_context_); + URLRequest req(test_server_.GetURL("echoheadercache?foo"), + DEFAULT_PRIORITY, + &d, + &default_context_); HttpRequestHeaders headers; headers.SetHeader("foo", "2"); req.SetExtraRequestHeaders(headers); @@ -5101,7 +5279,10 @@ TEST_F(URLRequestTestHTTP, BasicAuth) { TestDelegate d; d.set_credentials(AuthCredentials(kUser, kSecret)); - URLRequest r(test_server_.GetURL("auth-basic"), &d, &default_context_); + URLRequest r(test_server_.GetURL("auth-basic"), + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); base::RunLoop().Run(); @@ -5116,7 +5297,10 @@ TEST_F(URLRequestTestHTTP, BasicAuth) { TestDelegate d; d.set_credentials(AuthCredentials(kUser, kSecret)); - URLRequest r(test_server_.GetURL("auth-basic"), &d, &default_context_); + URLRequest r(test_server_.GetURL("auth-basic"), + DEFAULT_PRIORITY, + &d, + &default_context_); r.set_load_flags(LOAD_VALIDATE_CACHE); r.Start(); @@ -5148,7 +5332,7 @@ TEST_F(URLRequestTestHTTP, BasicAuthWithCookies) { TestDelegate d; d.set_credentials(AuthCredentials(kUser, kSecret)); - URLRequest r(url_requiring_auth, &d, &context); + URLRequest r(url_requiring_auth, DEFAULT_PRIORITY, &d, &context); r.Start(); base::RunLoop().Run(); @@ -5177,7 +5361,7 @@ TEST_F(URLRequestTestHTTP, BasicAuthWithCookies) { replacements.SetPasswordStr(password); GURL url_with_identity = url_requiring_auth.ReplaceComponents(replacements); - URLRequest r(url_with_identity, &d, &context); + URLRequest r(url_with_identity, DEFAULT_PRIORITY, &d, &context); r.Start(); base::RunLoop().Run(); @@ -5199,7 +5383,10 @@ TEST_F(URLRequestTestHTTP, BasicAuthLoadTiming) { TestDelegate d; d.set_credentials(AuthCredentials(kUser, kSecret)); - URLRequest r(test_server_.GetURL("auth-basic"), &d, &default_context_); + URLRequest r(test_server_.GetURL("auth-basic"), + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); base::RunLoop().Run(); @@ -5230,7 +5417,10 @@ TEST_F(URLRequestTestHTTP, BasicAuthLoadTiming) { TestDelegate d; d.set_credentials(AuthCredentials(kUser, kSecret)); - URLRequest r(test_server_.GetURL("auth-basic"), &d, &default_context_); + URLRequest r(test_server_.GetURL("auth-basic"), + DEFAULT_PRIORITY, + &d, + &default_context_); r.set_load_flags(LOAD_VALIDATE_CACHE); r.Start(); @@ -5259,8 +5449,10 @@ TEST_F(URLRequestTestHTTP, Post302RedirectGet) { const char kData[] = "hello world"; TestDelegate d; - URLRequest req( - test_server_.GetURL("files/redirect-to-echoall"), &d, &default_context_); + URLRequest req(test_server_.GetURL("files/redirect-to-echoall"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.set_method("POST"); req.set_upload(make_scoped_ptr(CreateSimpleUploadData(kData))); @@ -5346,7 +5538,10 @@ TEST_F(URLRequestTestHTTP, InterceptPost302RedirectGet) { const char kData[] = "hello world"; TestDelegate d; - URLRequest req(test_server_.GetURL("empty.html"), &d, &default_context_); + URLRequest req(test_server_.GetURL("empty.html"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.set_method("POST"); req.set_upload(make_scoped_ptr(CreateSimpleUploadData(kData))); HttpRequestHeaders headers; @@ -5370,7 +5565,10 @@ TEST_F(URLRequestTestHTTP, InterceptPost307RedirectPost) { const char kData[] = "hello world"; TestDelegate d; - URLRequest req(test_server_.GetURL("empty.html"), &d, &default_context_); + URLRequest req(test_server_.GetURL("empty.html"), + DEFAULT_PRIORITY, + &d, + &default_context_); req.set_method("POST"); req.set_upload(make_scoped_ptr(CreateSimpleUploadData(kData))); HttpRequestHeaders headers; @@ -5401,8 +5599,10 @@ TEST_F(URLRequestTestHTTP, DefaultAcceptLanguage) { context.Init(); TestDelegate d; - URLRequest req( - test_server_.GetURL("echoheader?Accept-Language"), &d, &context); + URLRequest req(test_server_.GetURL("echoheader?Accept-Language"), + DEFAULT_PRIORITY, + &d, + &context); req.Start(); base::RunLoop().Run(); EXPECT_EQ("en", d.data_received()); @@ -5422,8 +5622,10 @@ TEST_F(URLRequestTestHTTP, EmptyAcceptLanguage) { context.set_http_user_agent_settings(&settings); TestDelegate d; - URLRequest req( - test_server_.GetURL("echoheader?Accept-Language"), &d, &context); + URLRequest req(test_server_.GetURL("echoheader?Accept-Language"), + DEFAULT_PRIORITY, + &d, + &context); req.Start(); base::RunLoop().Run(); EXPECT_EQ("None", d.data_received()); @@ -5436,6 +5638,7 @@ TEST_F(URLRequestTestHTTP, OverrideAcceptLanguage) { TestDelegate d; URLRequest req(test_server_.GetURL("echoheader?Accept-Language"), + DEFAULT_PRIORITY, &d, &default_context_); HttpRequestHeaders headers; @@ -5452,6 +5655,7 @@ TEST_F(URLRequestTestHTTP, DefaultAcceptEncoding) { TestDelegate d; URLRequest req(test_server_.GetURL("echoheader?Accept-Encoding"), + DEFAULT_PRIORITY, &d, &default_context_); HttpRequestHeaders headers; @@ -5468,6 +5672,7 @@ TEST_F(URLRequestTestHTTP, OverrideAcceptEncoding) { TestDelegate d; URLRequest req(test_server_.GetURL("echoheader?Accept-Encoding"), + DEFAULT_PRIORITY, &d, &default_context_); HttpRequestHeaders headers; @@ -5485,6 +5690,7 @@ TEST_F(URLRequestTestHTTP, SetAcceptCharset) { TestDelegate d; URLRequest req(test_server_.GetURL("echoheader?Accept-Charset"), + DEFAULT_PRIORITY, &d, &default_context_); HttpRequestHeaders headers; @@ -5501,6 +5707,7 @@ TEST_F(URLRequestTestHTTP, DefaultUserAgent) { TestDelegate d; URLRequest req(test_server_.GetURL("echoheader?User-Agent"), + DEFAULT_PRIORITY, &d, &default_context_); req.Start(); @@ -5515,6 +5722,7 @@ TEST_F(URLRequestTestHTTP, OverrideUserAgent) { TestDelegate d; URLRequest req(test_server_.GetURL("echoheader?User-Agent"), + DEFAULT_PRIORITY, &d, &default_context_); HttpRequestHeaders headers; @@ -5551,7 +5759,8 @@ TEST_F(URLRequestTestHTTP, EmptyHttpUserAgentSettings) { for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); i++) { TestDelegate d; - URLRequest req(test_server_.GetURL(tests[i].request), &d, &context); + URLRequest req( + test_server_.GetURL(tests[i].request), DEFAULT_PRIORITY, &d, &context); req.Start(); base::RunLoop().Run(); EXPECT_EQ(tests[i].expected_response, d.data_received()) @@ -5565,7 +5774,10 @@ TEST_F(URLRequestTestHTTP, SetSubsequentJobPriority) { ASSERT_TRUE(test_server_.Start()); TestDelegate d; - URLRequest req(test_server_.GetURL("empty.html"), &d, &default_context_); + URLRequest req(test_server_.GetURL("empty.html"), + DEFAULT_PRIORITY, + &d, + &default_context_); EXPECT_EQ(DEFAULT_PRIORITY, req.priority()); scoped_refptr<URLRequestRedirectJob> redirect_job = @@ -5609,7 +5821,10 @@ TEST_F(HTTPSRequestTest, HTTPSGetTest) { TestDelegate d; { - URLRequest r(test_server.GetURL(std::string()), &d, &default_context_); + URLRequest r(test_server.GetURL(std::string()), + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -5640,7 +5855,10 @@ TEST_F(HTTPSRequestTest, HTTPSMismatchedTest) { TestDelegate d; { d.set_allow_certificate_errors(err_allowed); - URLRequest r(test_server.GetURL(std::string()), &d, &default_context_); + URLRequest r(test_server.GetURL(std::string()), + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -5676,7 +5894,10 @@ TEST_F(HTTPSRequestTest, HTTPSExpiredTest) { TestDelegate d; { d.set_allow_certificate_errors(err_allowed); - URLRequest r(test_server.GetURL(std::string()), &d, &default_context_); + URLRequest r(test_server.GetURL(std::string()), + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -5721,7 +5942,8 @@ TEST_F(HTTPSRequestTest, TLSv1Fallback) { TestURLRequestContext context(true); context.Init(); d.set_allow_certificate_errors(true); - URLRequest r(test_server.GetURL(std::string()), &d, &context); + URLRequest r( + test_server.GetURL(std::string()), DEFAULT_PRIORITY, &d, &context); r.Start(); base::RunLoop().Run(); @@ -5762,6 +5984,7 @@ TEST_F(HTTPSRequestTest, HTTPSPreloadedHSTSTest) { TestDelegate d; URLRequest r(GURL(base::StringPrintf("https://www.google.com:%d", test_server.host_port_pair().port())), + DEFAULT_PRIORITY, &d, &context); @@ -5810,6 +6033,7 @@ TEST_F(HTTPSRequestTest, HTTPSErrorsNoClobberTSSTest) { TestDelegate d; URLRequest r(GURL(base::StringPrintf("https://www.google.com:%d", test_server.host_port_pair().port())), + DEFAULT_PRIORITY, &d, &context); @@ -5881,6 +6105,7 @@ TEST_F(HTTPSRequestTest, HSTSPreservesPosts) { URLRequest req(GURL(base::StringPrintf("http://www.somewhere.com:%d/echo", test_server.host_port_pair().port())), + DEFAULT_PRIORITY, &d, &context); req.set_method("POST"); @@ -5914,7 +6139,8 @@ TEST_F(HTTPSRequestTest, SSLv3Fallback) { TestURLRequestContext context(true); context.Init(); d.set_allow_certificate_errors(true); - URLRequest r(test_server.GetURL(std::string()), &d, &context); + URLRequest r( + test_server.GetURL(std::string()), DEFAULT_PRIORITY, &d, &context); r.Start(); base::RunLoop().Run(); @@ -5963,7 +6189,10 @@ TEST_F(HTTPSRequestTest, ClientAuthTest) { SSLClientAuthTestDelegate d; { - URLRequest r(test_server.GetURL(std::string()), &d, &default_context_); + URLRequest r(test_server.GetURL(std::string()), + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -6002,8 +6231,10 @@ TEST_F(HTTPSRequestTest, ResumeTest) { { TestDelegate d; - URLRequest r( - test_server.GetURL("ssl-session-cache"), &d, &default_context_); + URLRequest r(test_server.GetURL("ssl-session-cache"), + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -6018,8 +6249,10 @@ TEST_F(HTTPSRequestTest, ResumeTest) { { TestDelegate d; - URLRequest r( - test_server.GetURL("ssl-session-cache"), &d, &default_context_); + URLRequest r(test_server.GetURL("ssl-session-cache"), + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -6071,8 +6304,10 @@ TEST_F(HTTPSRequestTest, SSLSessionCacheShardTest) { { TestDelegate d; - URLRequest r( - test_server.GetURL("ssl-session-cache"), &d, &default_context_); + URLRequest r(test_server.GetURL("ssl-session-cache"), + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -6103,8 +6338,10 @@ TEST_F(HTTPSRequestTest, SSLSessionCacheShardTest) { { TestDelegate d; - URLRequest r( - test_server.GetURL("ssl-session-cache"), &d, &default_context_); + URLRequest r(test_server.GetURL("ssl-session-cache"), + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -6222,7 +6459,8 @@ class HTTPSOCSPTest : public HTTPSRequestTest { TestDelegate d; d.set_allow_certificate_errors(true); - URLRequest r(test_server.GetURL(std::string()), &d, &context_); + URLRequest r( + test_server.GetURL(std::string()), DEFAULT_PRIORITY, &d, &context_); r.Start(); base::RunLoop().Run(); @@ -6677,7 +6915,7 @@ TEST_F(URLRequestTestFTP, UnsafePort) { TestDelegate d; { - URLRequest r(url, &d, &default_context_); + URLRequest r(url, DEFAULT_PRIORITY, &d, &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -6695,7 +6933,8 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPDirectoryListing) { TestDelegate d; { - URLRequest r(test_server_.GetURL("/"), &d, &default_context_); + URLRequest r( + test_server_.GetURL("/"), DEFAULT_PRIORITY, &d, &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -6721,7 +6960,10 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPGetTestAnonymous) { app_path = app_path.AppendASCII("LICENSE"); TestDelegate d; { - URLRequest r(test_server_.GetURL("/LICENSE"), &d, &default_context_); + URLRequest r(test_server_.GetURL("/LICENSE"), + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -6752,6 +6994,7 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPGetTest) { { URLRequest r( test_server_.GetURLWithUserAndPassword("/LICENSE", "chrome", "chrome"), + DEFAULT_PRIORITY, &d, &default_context_); r.Start(); @@ -6786,12 +7029,11 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCheckWrongPassword) { app_path = app_path.AppendASCII("LICENSE"); TestDelegate d; { - URLRequest r( - test_server_.GetURLWithUserAndPassword("/LICENSE", - "chrome", - "wrong_password"), - &d, - &default_context_); + URLRequest r(test_server_.GetURLWithUserAndPassword( + "/LICENSE", "chrome", "wrong_password"), + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -6819,12 +7061,11 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCheckWrongPasswordRestart) { // the initial login with wrong credentials will fail. d.set_credentials(AuthCredentials(kChrome, kChrome)); { - URLRequest r( - test_server_.GetURLWithUserAndPassword("/LICENSE", - "chrome", - "wrong_password"), - &d, - &default_context_); + URLRequest r(test_server_.GetURLWithUserAndPassword( + "/LICENSE", "chrome", "wrong_password"), + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -6849,12 +7090,11 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCheckWrongUser) { app_path = app_path.AppendASCII("LICENSE"); TestDelegate d; { - URLRequest r( - test_server_.GetURLWithUserAndPassword("/LICENSE", - "wrong_user", - "chrome"), - &d, - &default_context_); + URLRequest r(test_server_.GetURLWithUserAndPassword( + "/LICENSE", "wrong_user", "chrome"), + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -6882,12 +7122,11 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCheckWrongUserRestart) { // the initial login with wrong credentials will fail. d.set_credentials(AuthCredentials(kChrome, kChrome)); { - URLRequest r( - test_server_.GetURLWithUserAndPassword("/LICENSE", - "wrong_user", - "chrome"), - &d, - &default_context_); + URLRequest r(test_server_.GetURLWithUserAndPassword( + "/LICENSE", "wrong_user", "chrome"), + DEFAULT_PRIORITY, + &d, + &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -6915,9 +7154,8 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCacheURLCredentials) { { // Pass correct login identity in the URL. URLRequest r( - test_server_.GetURLWithUserAndPassword("/LICENSE", - "chrome", - "chrome"), + test_server_.GetURLWithUserAndPassword("/LICENSE", "chrome", "chrome"), + DEFAULT_PRIORITY, d.get(), &default_context_); r.Start(); @@ -6937,7 +7175,10 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCacheURLCredentials) { d.reset(new TestDelegate); { // This request should use cached identity from previous request. - URLRequest r(test_server_.GetURL("/LICENSE"), d.get(), &default_context_); + URLRequest r(test_server_.GetURL("/LICENSE"), + DEFAULT_PRIORITY, + d.get(), + &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -6966,12 +7207,11 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCacheLoginBoxCredentials) { // the initial login with wrong credentials will fail. d->set_credentials(AuthCredentials(kChrome, kChrome)); { - URLRequest r( - test_server_.GetURLWithUserAndPassword("/LICENSE", - "chrome", - "wrong_password"), - d.get(), - &default_context_); + URLRequest r(test_server_.GetURLWithUserAndPassword( + "/LICENSE", "chrome", "wrong_password"), + DEFAULT_PRIORITY, + d.get(), + &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); @@ -6992,7 +7232,10 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCacheLoginBoxCredentials) { { // Don't pass wrong credentials in the URL, they would override valid cached // ones. - URLRequest r(test_server_.GetURL("/LICENSE"), d.get(), &default_context_); + URLRequest r(test_server_.GetURL("/LICENSE"), + DEFAULT_PRIORITY, + d.get(), + &default_context_); r.Start(); EXPECT_TRUE(r.is_pending()); diff --git a/webkit/browser/appcache/appcache_request_handler_unittest.cc b/webkit/browser/appcache/appcache_request_handler_unittest.cc index 286fd79..a931477 100644 --- a/webkit/browser/appcache/appcache_request_handler_unittest.cc +++ b/webkit/browser/appcache/appcache_request_handler_unittest.cc @@ -13,6 +13,7 @@ #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" #include "net/base/net_errors.h" +#include "net/base/request_priority.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" @@ -117,17 +118,12 @@ class AppCacheRequestHandlerTest : public testing::Test { class MockURLRequest : public net::URLRequest { public: - MockURLRequest( - const GURL& url, - net::URLRequestContext* context, - net::NetworkDelegate* network_delegate) : - net::URLRequest(url, NULL, context, network_delegate), - network_delegate_(network_delegate) { - } + MockURLRequest(const GURL& url, net::URLRequestContext* context) + : net::URLRequest(url, net::DEFAULT_PRIORITY, NULL, context) {} void SimulateResponseCode(int http_response_code) { mock_factory_job_ = new MockURLRequestJob( - this, network_delegate_, http_response_code); + this, context()->network_delegate(), http_response_code); Start(); DCHECK(!mock_factory_job_); // All our simulation needs to satisfy are the following two DCHECKs @@ -136,17 +132,14 @@ class AppCacheRequestHandlerTest : public testing::Test { } void SimulateResponseInfo(const net::HttpResponseInfo& info) { - mock_factory_job_ = new MockURLRequestJob( - this, network_delegate_, info); + mock_factory_job_ = + new MockURLRequestJob(this, context()->network_delegate(), info); set_delegate(&delegate_); // needed to get the info back out Start(); DCHECK(!mock_factory_job_); } MockURLRequestDelegate delegate_; - - private: - net::NetworkDelegate* network_delegate_; }; static net::URLRequestJob* MockHttpJobFactory( @@ -178,9 +171,7 @@ class AppCacheRequestHandlerTest : public testing::Test { // Test harness -------------------------------------------------- - AppCacheRequestHandlerTest() - : host_(NULL), empty_network_delegate_(NULL), orig_http_factory_(NULL) { - } + AppCacheRequestHandlerTest() : host_(NULL), orig_http_factory_(NULL) {} template <class Method> void RunTestOnIOThread(Method method) { @@ -207,7 +198,6 @@ class AppCacheRequestHandlerTest : public testing::Test { const int kHostId = 1; backend_impl_->RegisterHost(kHostId); host_ = backend_impl_->GetHost(kHostId); - empty_network_delegate_ = NULL; } void TearDownTest() { @@ -224,7 +214,6 @@ class AppCacheRequestHandlerTest : public testing::Test { mock_service_.reset(); mock_policy_.reset(); host_ = NULL; - empty_network_delegate_ = NULL; } void TestFinished() { @@ -263,13 +252,13 @@ class AppCacheRequestHandlerTest : public testing::Test { base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Miss, base::Unretained(this))); - request_.reset(new MockURLRequest( - GURL("http://blah/"), &empty_context_, empty_network_delegate_)); + request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_)); handler_.reset(host_->CreateRequestHandler(request_.get(), ResourceType::MAIN_FRAME)); EXPECT_TRUE(handler_.get()); - job_ = handler_->MaybeLoadResource(request_.get(), empty_network_delegate_); + job_ = handler_->MaybeLoadResource(request_.get(), + request_->context()->network_delegate()); EXPECT_TRUE(job_.get()); EXPECT_TRUE(job_->is_waiting()); @@ -291,11 +280,11 @@ class AppCacheRequestHandlerTest : public testing::Test { AppCacheURLRequestJob* fallback_job; fallback_job = handler_->MaybeLoadFallbackForRedirect( request_.get(), - empty_network_delegate_, + request_->context()->network_delegate(), GURL("http://blah/redirect")); EXPECT_FALSE(fallback_job); fallback_job = handler_->MaybeLoadFallbackForResponse( - request_.get(), empty_network_delegate_); + request_.get(), request_->context()->network_delegate()); EXPECT_FALSE(fallback_job); EXPECT_TRUE(host_->preferred_manifest_url().is_empty()); @@ -310,8 +299,7 @@ class AppCacheRequestHandlerTest : public testing::Test { base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Hit, base::Unretained(this))); - request_.reset(new MockURLRequest( - GURL("http://blah/"), &empty_context_, empty_network_delegate_)); + request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_)); handler_.reset(host_->CreateRequestHandler(request_.get(), ResourceType::MAIN_FRAME)); EXPECT_TRUE(handler_.get()); @@ -321,7 +309,8 @@ class AppCacheRequestHandlerTest : public testing::Test { GURL(), AppCacheEntry(), 1, 2, GURL("http://blah/manifest/")); - job_ = handler_->MaybeLoadResource(request_.get(), empty_network_delegate_); + job_ = handler_->MaybeLoadResource(request_.get(), + request_->context()->network_delegate()); EXPECT_TRUE(job_.get()); EXPECT_TRUE(job_->is_waiting()); @@ -342,7 +331,7 @@ class AppCacheRequestHandlerTest : public testing::Test { AppCacheURLRequestJob* fallback_job; fallback_job = handler_->MaybeLoadFallbackForResponse( - request_.get(), empty_network_delegate_); + request_.get(), request_->context()->network_delegate()); EXPECT_FALSE(fallback_job); EXPECT_EQ(GURL("http://blah/manifest/"), @@ -358,8 +347,7 @@ class AppCacheRequestHandlerTest : public testing::Test { base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Fallback, base::Unretained(this))); - request_.reset(new MockURLRequest( - GURL("http://blah/"), &empty_context_, empty_network_delegate_)); + request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_)); handler_.reset(host_->CreateRequestHandler(request_.get(), ResourceType::MAIN_FRAME)); EXPECT_TRUE(handler_.get()); @@ -370,7 +358,8 @@ class AppCacheRequestHandlerTest : public testing::Test { AppCacheEntry(AppCacheEntry::EXPLICIT, 1), 1, 2, GURL("http://blah/manifest/")); - job_ = handler_->MaybeLoadResource(request_.get(), empty_network_delegate_); + job_ = handler_->MaybeLoadResource(request_.get(), + request_->context()->network_delegate()); EXPECT_TRUE(job_.get()); EXPECT_TRUE(job_->is_waiting()); @@ -385,14 +374,15 @@ class AppCacheRequestHandlerTest : public testing::Test { // When the request is restarted, the existing job is dropped so a // real network job gets created. We expect NULL here which will cause // the net library to create a real job. - job_ = handler_->MaybeLoadResource(request_.get(), empty_network_delegate_); + job_ = handler_->MaybeLoadResource(request_.get(), + request_->context()->network_delegate()); EXPECT_FALSE(job_.get()); // Simulate an http error of the real network job. request_->SimulateResponseCode(500); job_ = handler_->MaybeLoadFallbackForResponse( - request_.get(), empty_network_delegate_); + request_.get(), request_->context()->network_delegate()); EXPECT_TRUE(job_.get()); EXPECT_TRUE(job_->is_delivering_appcache_response()); @@ -417,9 +407,8 @@ class AppCacheRequestHandlerTest : public testing::Test { &AppCacheRequestHandlerTest::Verify_MainResource_FallbackOverride, base::Unretained(this))); - request_.reset(new MockURLRequest( - GURL("http://blah/fallback-override"), - &empty_context_, empty_network_delegate_)); + request_.reset(new MockURLRequest(GURL("http://blah/fallback-override"), + &empty_context_)); handler_.reset(host_->CreateRequestHandler(request_.get(), ResourceType::MAIN_FRAME)); EXPECT_TRUE(handler_.get()); @@ -430,7 +419,8 @@ class AppCacheRequestHandlerTest : public testing::Test { AppCacheEntry(AppCacheEntry::EXPLICIT, 1), 1, 2, GURL("http://blah/manifest/")); - job_ = handler_->MaybeLoadResource(request_.get(), empty_network_delegate_); + job_ = handler_->MaybeLoadResource(request_.get(), + request_->context()->network_delegate()); EXPECT_TRUE(job_.get()); EXPECT_TRUE(job_->is_waiting()); @@ -445,7 +435,8 @@ class AppCacheRequestHandlerTest : public testing::Test { // When the request is restarted, the existing job is dropped so a // real network job gets created. We expect NULL here which will cause // the net library to create a real job. - job_ = handler_->MaybeLoadResource(request_.get(), empty_network_delegate_); + job_ = handler_->MaybeLoadResource(request_.get(), + request_->context()->network_delegate()); EXPECT_FALSE(job_.get()); // Simulate an http error of the real network job, but with custom @@ -460,7 +451,7 @@ class AppCacheRequestHandlerTest : public testing::Test { request_->SimulateResponseInfo(info); job_ = handler_->MaybeLoadFallbackForResponse( - request_.get(), empty_network_delegate_); + request_.get(), request_->context()->network_delegate()); EXPECT_FALSE(job_.get()); TestFinished(); @@ -469,8 +460,7 @@ class AppCacheRequestHandlerTest : public testing::Test { // SubResource_Miss_WithNoCacheSelected ---------------------------------- void SubResource_Miss_WithNoCacheSelected() { - request_.reset(new MockURLRequest( - GURL("http://blah/"), &empty_context_, empty_network_delegate_)); + request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_)); handler_.reset(host_->CreateRequestHandler(request_.get(), ResourceType::SUB_RESOURCE)); @@ -488,22 +478,24 @@ class AppCacheRequestHandlerTest : public testing::Test { // in a network or fallback namespace, should result in a failed request. host_->AssociateCompleteCache(MakeNewCache()); - request_.reset(new MockURLRequest( - GURL("http://blah/"), &empty_context_, empty_network_delegate_)); + request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_)); handler_.reset(host_->CreateRequestHandler(request_.get(), ResourceType::SUB_RESOURCE)); EXPECT_TRUE(handler_.get()); - job_ = handler_->MaybeLoadResource(request_.get(), empty_network_delegate_); + job_ = handler_->MaybeLoadResource(request_.get(), + request_->context()->network_delegate()); EXPECT_TRUE(job_.get()); EXPECT_TRUE(job_->is_delivering_error_response()); AppCacheURLRequestJob* fallback_job; fallback_job = handler_->MaybeLoadFallbackForRedirect( - request_.get(), empty_network_delegate_, GURL("http://blah/redirect")); + request_.get(), + request_->context()->network_delegate(), + GURL("http://blah/redirect")); EXPECT_FALSE(fallback_job); fallback_job = handler_->MaybeLoadFallbackForResponse( - request_.get(), empty_network_delegate_); + request_.get(), request_->context()->network_delegate()); EXPECT_FALSE(fallback_job); TestFinished(); @@ -517,12 +509,12 @@ class AppCacheRequestHandlerTest : public testing::Test { host_->pending_selected_cache_id_ = cache->cache_id(); host_->set_preferred_manifest_url(cache->owning_group()->manifest_url()); - request_.reset(new MockURLRequest( - GURL("http://blah/"), &empty_context_, empty_network_delegate_)); + request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_)); handler_.reset(host_->CreateRequestHandler(request_.get(), ResourceType::SUB_RESOURCE)); EXPECT_TRUE(handler_.get()); - job_ = handler_->MaybeLoadResource(request_.get(), empty_network_delegate_); + job_ = handler_->MaybeLoadResource(request_.get(), + request_->context()->network_delegate()); EXPECT_TRUE(job_.get()); EXPECT_TRUE(job_->is_waiting()); @@ -532,10 +524,12 @@ class AppCacheRequestHandlerTest : public testing::Test { AppCacheURLRequestJob* fallback_job; fallback_job = handler_->MaybeLoadFallbackForRedirect( - request_.get(), empty_network_delegate_, GURL("http://blah/redirect")); + request_.get(), + request_->context()->network_delegate(), + GURL("http://blah/redirect")); EXPECT_FALSE(fallback_job); fallback_job = handler_->MaybeLoadFallbackForResponse( - request_.get(), empty_network_delegate_); + request_.get(), request_->context()->network_delegate()); EXPECT_FALSE(fallback_job); TestFinished(); @@ -549,21 +543,23 @@ class AppCacheRequestHandlerTest : public testing::Test { mock_storage()->SimulateFindSubResource( AppCacheEntry(AppCacheEntry::EXPLICIT, 1), AppCacheEntry(), false); - request_.reset(new MockURLRequest( - GURL("http://blah/"), &empty_context_, empty_network_delegate_)); + request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_)); handler_.reset(host_->CreateRequestHandler(request_.get(), ResourceType::SUB_RESOURCE)); EXPECT_TRUE(handler_.get()); - job_ = handler_->MaybeLoadResource(request_.get(), empty_network_delegate_); + job_ = handler_->MaybeLoadResource(request_.get(), + request_->context()->network_delegate()); EXPECT_TRUE(job_.get()); EXPECT_TRUE(job_->is_delivering_appcache_response()); AppCacheURLRequestJob* fallback_job; fallback_job = handler_->MaybeLoadFallbackForRedirect( - request_.get(), empty_network_delegate_, GURL("http://blah/redirect")); + request_.get(), + request_->context()->network_delegate(), + GURL("http://blah/redirect")); EXPECT_FALSE(fallback_job); fallback_job = handler_->MaybeLoadFallbackForResponse( - request_.get(), empty_network_delegate_); + request_.get(), request_->context()->network_delegate()); EXPECT_FALSE(fallback_job); TestFinished(); @@ -579,24 +575,24 @@ class AppCacheRequestHandlerTest : public testing::Test { mock_storage()->SimulateFindSubResource( AppCacheEntry(), AppCacheEntry(AppCacheEntry::EXPLICIT, 1), false); - request_.reset(new MockURLRequest( - GURL("http://blah/"), &empty_context_, empty_network_delegate_)); + request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_)); handler_.reset(host_->CreateRequestHandler(request_.get(), ResourceType::SUB_RESOURCE)); EXPECT_TRUE(handler_.get()); - job_ = handler_->MaybeLoadResource(request_.get(), empty_network_delegate_); + job_ = handler_->MaybeLoadResource(request_.get(), + request_->context()->network_delegate()); EXPECT_FALSE(job_.get()); job_ = handler_->MaybeLoadFallbackForRedirect( request_.get(), - empty_network_delegate_, + request_->context()->network_delegate(), GURL("http://not_blah/redirect")); EXPECT_TRUE(job_.get()); EXPECT_TRUE(job_->is_delivering_appcache_response()); AppCacheURLRequestJob* fallback_job; fallback_job = handler_->MaybeLoadFallbackForResponse( - request_.get(), empty_network_delegate_); + request_.get(), request_->context()->network_delegate()); EXPECT_FALSE(fallback_job); TestFinished(); @@ -612,22 +608,24 @@ class AppCacheRequestHandlerTest : public testing::Test { mock_storage()->SimulateFindSubResource( AppCacheEntry(), AppCacheEntry(AppCacheEntry::EXPLICIT, 1), false); - request_.reset(new MockURLRequest( - GURL("http://blah/"), &empty_context_, empty_network_delegate_)); + request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_)); handler_.reset(host_->CreateRequestHandler(request_.get(), ResourceType::SUB_RESOURCE)); EXPECT_TRUE(handler_.get()); - job_ = handler_->MaybeLoadResource(request_.get(), empty_network_delegate_); + job_ = handler_->MaybeLoadResource(request_.get(), + request_->context()->network_delegate()); EXPECT_FALSE(job_.get()); AppCacheURLRequestJob* fallback_job; fallback_job = handler_->MaybeLoadFallbackForRedirect( - request_.get(), empty_network_delegate_, GURL("http://blah/redirect")); + request_.get(), + request_->context()->network_delegate(), + GURL("http://blah/redirect")); EXPECT_FALSE(fallback_job); request_->SimulateResponseCode(200); fallback_job = handler_->MaybeLoadFallbackForResponse( - request_.get(), empty_network_delegate_); + request_.get(), request_->context()->network_delegate()); EXPECT_FALSE(fallback_job); TestFinished(); @@ -644,20 +642,22 @@ class AppCacheRequestHandlerTest : public testing::Test { mock_storage()->SimulateFindSubResource( AppCacheEntry(), AppCacheEntry(), true); - request_.reset(new MockURLRequest( - GURL("http://blah/"), &empty_context_, empty_network_delegate_)); + request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_)); handler_.reset(host_->CreateRequestHandler(request_.get(), ResourceType::SUB_RESOURCE)); EXPECT_TRUE(handler_.get()); - job_ = handler_->MaybeLoadResource(request_.get(), empty_network_delegate_); + job_ = handler_->MaybeLoadResource(request_.get(), + request_->context()->network_delegate()); EXPECT_FALSE(job_.get()); AppCacheURLRequestJob* fallback_job; fallback_job = handler_->MaybeLoadFallbackForRedirect( - request_.get(), empty_network_delegate_, GURL("http://blah/redirect")); + request_.get(), + request_->context()->network_delegate(), + GURL("http://blah/redirect")); EXPECT_FALSE(fallback_job); fallback_job = handler_->MaybeLoadFallbackForResponse( - request_.get(), empty_network_delegate_); + request_.get(), request_->context()->network_delegate()); EXPECT_FALSE(fallback_job); TestFinished(); @@ -671,8 +671,7 @@ class AppCacheRequestHandlerTest : public testing::Test { mock_storage()->SimulateFindSubResource( AppCacheEntry(AppCacheEntry::EXPLICIT, 1), AppCacheEntry(), false); - request_.reset(new MockURLRequest( - GURL("http://blah/"), &empty_context_, empty_network_delegate_)); + request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_)); handler_.reset(host_->CreateRequestHandler(request_.get(), ResourceType::SUB_RESOURCE)); EXPECT_TRUE(handler_.get()); @@ -681,11 +680,13 @@ class AppCacheRequestHandlerTest : public testing::Test { host_ = NULL; EXPECT_FALSE(handler_->MaybeLoadResource( - request_.get(), empty_network_delegate_)); + request_.get(), request_->context()->network_delegate())); EXPECT_FALSE(handler_->MaybeLoadFallbackForRedirect( - request_.get(), empty_network_delegate_, GURL("http://blah/redirect"))); + request_.get(), + request_->context()->network_delegate(), + GURL("http://blah/redirect"))); EXPECT_FALSE(handler_->MaybeLoadFallbackForResponse( - request_.get(), empty_network_delegate_)); + request_.get(), request_->context()->network_delegate())); TestFinished(); } @@ -696,13 +697,13 @@ class AppCacheRequestHandlerTest : public testing::Test { // Precondition, the host is waiting on cache selection. host_->pending_selected_cache_id_ = 1; - request_.reset(new MockURLRequest( - GURL("http://blah/"), &empty_context_, empty_network_delegate_)); + request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_)); handler_.reset(host_->CreateRequestHandler(request_.get(), ResourceType::SUB_RESOURCE)); EXPECT_TRUE(handler_.get()); - job_ = handler_->MaybeLoadResource(request_.get(), empty_network_delegate_); + job_ = handler_->MaybeLoadResource(request_.get(), + request_->context()->network_delegate()); EXPECT_TRUE(job_.get()); EXPECT_TRUE(job_->is_waiting()); @@ -711,11 +712,13 @@ class AppCacheRequestHandlerTest : public testing::Test { EXPECT_TRUE(job_->has_been_killed()); EXPECT_FALSE(handler_->MaybeLoadResource( - request_.get(), empty_network_delegate_)); + request_.get(), request_->context()->network_delegate())); EXPECT_FALSE(handler_->MaybeLoadFallbackForRedirect( - request_.get(), empty_network_delegate_, GURL("http://blah/redirect"))); + request_.get(), + request_->context()->network_delegate(), + GURL("http://blah/redirect"))); EXPECT_FALSE(handler_->MaybeLoadFallbackForResponse( - request_.get(), empty_network_delegate_)); + request_.get(), request_->context()->network_delegate())); TestFinished(); } @@ -726,18 +729,19 @@ class AppCacheRequestHandlerTest : public testing::Test { // Precondition, the host is waiting on cache selection. host_->pending_selected_cache_id_ = 1; - request_.reset(new MockURLRequest( - GURL("ftp://blah/"), &empty_context_, empty_network_delegate_)); + request_.reset(new MockURLRequest(GURL("ftp://blah/"), &empty_context_)); handler_.reset(host_->CreateRequestHandler(request_.get(), ResourceType::SUB_RESOURCE)); EXPECT_TRUE(handler_.get()); // we could redirect to http (conceivably) EXPECT_FALSE(handler_->MaybeLoadResource( - request_.get(), empty_network_delegate_)); + request_.get(), request_->context()->network_delegate())); EXPECT_FALSE(handler_->MaybeLoadFallbackForRedirect( - request_.get(), empty_network_delegate_, GURL("ftp://blah/redirect"))); + request_.get(), + request_->context()->network_delegate(), + GURL("ftp://blah/redirect"))); EXPECT_FALSE(handler_->MaybeLoadFallbackForResponse( - request_.get(), empty_network_delegate_)); + request_.get(), request_->context()->network_delegate())); TestFinished(); } @@ -745,13 +749,13 @@ class AppCacheRequestHandlerTest : public testing::Test { // CanceledRequest ----------------------------- void CanceledRequest() { - request_.reset(new MockURLRequest( - GURL("http://blah/"), &empty_context_, empty_network_delegate_)); + request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_)); handler_.reset(host_->CreateRequestHandler(request_.get(), ResourceType::MAIN_FRAME)); EXPECT_TRUE(handler_.get()); - job_ = handler_->MaybeLoadResource(request_.get(), empty_network_delegate_); + job_ = handler_->MaybeLoadResource(request_.get(), + request_->context()->network_delegate()); EXPECT_TRUE(job_.get()); EXPECT_TRUE(job_->is_waiting()); EXPECT_FALSE(job_->has_been_started()); @@ -764,7 +768,7 @@ class AppCacheRequestHandlerTest : public testing::Test { EXPECT_TRUE(job_->has_been_killed()); EXPECT_FALSE(handler_->MaybeLoadFallbackForResponse( - request_.get(), empty_network_delegate_)); + request_.get(), request_->context()->network_delegate())); TestFinished(); } @@ -781,8 +785,7 @@ class AppCacheRequestHandlerTest : public testing::Test { EXPECT_FALSE(AppCacheRequestHandler::IsMainResourceType( ResourceType::WORKER)); - request_.reset(new MockURLRequest( - GURL("http://blah/"), &empty_context_, empty_network_delegate_)); + request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_)); const int kParentHostId = host_->host_id(); const int kWorkerHostId = 2; @@ -819,8 +822,7 @@ class AppCacheRequestHandlerTest : public testing::Test { base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Blocked, base::Unretained(this))); - request_.reset(new MockURLRequest( - GURL("http://blah/"), &empty_context_, empty_network_delegate_)); + request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_)); handler_.reset(host_->CreateRequestHandler(request_.get(), ResourceType::MAIN_FRAME)); EXPECT_TRUE(handler_.get()); @@ -831,7 +833,8 @@ class AppCacheRequestHandlerTest : public testing::Test { GURL(), AppCacheEntry(), 1, 2, GURL("http://blah/manifest/")); - job_ = handler_->MaybeLoadResource(request_.get(), empty_network_delegate_); + job_ = handler_->MaybeLoadResource(request_.get(), + request_->context()->network_delegate()); EXPECT_TRUE(job_.get()); EXPECT_TRUE(job_->is_waiting()); @@ -880,7 +883,6 @@ class AppCacheRequestHandlerTest : public testing::Test { scoped_ptr<MockAppCachePolicy> mock_policy_; AppCacheHost* host_; net::URLRequestContext empty_context_; - net::NetworkDelegate* empty_network_delegate_; scoped_ptr<MockURLRequest> request_; scoped_ptr<AppCacheRequestHandler> handler_; scoped_refptr<AppCacheURLRequestJob> job_; diff --git a/webkit/browser/appcache/appcache_storage_impl_unittest.cc b/webkit/browser/appcache/appcache_storage_impl_unittest.cc index 9739f06..615b53d 100644 --- a/webkit/browser/appcache/appcache_storage_impl_unittest.cc +++ b/webkit/browser/appcache/appcache_storage_impl_unittest.cc @@ -9,10 +9,12 @@ #include "base/callback.h" #include "base/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" #include "net/base/net_errors.h" +#include "net/base/request_priority.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request_error_job.h" #include "net/url_request/url_request_job_factory_impl.h" @@ -1704,8 +1706,8 @@ class AppCacheStorageImplTest : public testing::Test { backend_->RegisterHost(2); AppCacheHost* host2 = backend_->GetHost(2); GURL manifest_url = MockHttpServer::GetMockUrl("manifest"); - request_.reset( - service()->request_context()->CreateRequest(manifest_url, NULL)); + request_ = service()->request_context()->CreateRequest( + manifest_url, net::DEFAULT_PRIORITY, NULL); AppCacheInterceptor::SetExtraRequestInfo( request_.get(), service_.get(), backend_->process_id(), host2->host_id(), diff --git a/webkit/browser/appcache/appcache_update_job.cc b/webkit/browser/appcache/appcache_update_job.cc index c3ea6b4..e4f14de 100644 --- a/webkit/browser/appcache/appcache_update_job.cc +++ b/webkit/browser/appcache/appcache_update_job.cc @@ -13,6 +13,7 @@ #include "net/base/io_buffer.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" +#include "net/base/request_priority.h" #include "net/http/http_request_headers.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request_context.h" @@ -91,15 +92,16 @@ AppCacheUpdateJob::UrlToFetch::~UrlToFetch() { // Helper class to fetch resources. Depending on the fetch type, // can either fetch to an in-memory string or write the response // data out to the disk cache. -AppCacheUpdateJob::URLFetcher::URLFetcher( - const GURL& url, FetchType fetch_type, AppCacheUpdateJob* job) +AppCacheUpdateJob::URLFetcher::URLFetcher(const GURL& url, + FetchType fetch_type, + AppCacheUpdateJob* job) : url_(url), job_(job), fetch_type_(fetch_type), retry_503_attempts_(0), buffer_(new net::IOBuffer(kBufferSize)), - request_(job->service_->request_context()->CreateRequest(url, this)) { -} + request_(job->service_->request_context() + ->CreateRequest(url, net::DEFAULT_PRIORITY, this)) {} AppCacheUpdateJob::URLFetcher::~URLFetcher() { } @@ -287,7 +289,8 @@ bool AppCacheUpdateJob::URLFetcher::MaybeRetryRequest() { return false; } ++retry_503_attempts_; - request_.reset(job_->service_->request_context()->CreateRequest(url_, this)); + request_ = job_->service_->request_context()->CreateRequest( + url_, net::DEFAULT_PRIORITY, this); Start(); return true; } diff --git a/webkit/browser/appcache/appcache_url_request_job_unittest.cc b/webkit/browser/appcache/appcache_url_request_job_unittest.cc index 95ad3bb..3f9675a 100644 --- a/webkit/browser/appcache/appcache_url_request_job_unittest.cc +++ b/webkit/browser/appcache/appcache_url_request_job_unittest.cc @@ -14,6 +14,7 @@ #include "base/threading/thread.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" +#include "net/base/request_priority.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" @@ -376,7 +377,8 @@ class AppCacheURLRequestJobTest : public testing::Test { // Basic ------------------------------------------------------------------- void Basic() { AppCacheStorage* storage = service_->storage(); - net::URLRequest request(GURL("http://blah/"), NULL, &empty_context_); + net::URLRequest request( + GURL("http://blah/"), net::DEFAULT_PRIORITY, NULL, &empty_context_); scoped_refptr<AppCacheURLRequestJob> job; // Create an instance and see that it looks as expected. @@ -399,7 +401,8 @@ class AppCacheURLRequestJobTest : public testing::Test { // DeliveryOrders ----------------------------------------------------- void DeliveryOrders() { AppCacheStorage* storage = service_->storage(); - net::URLRequest request(GURL("http://blah/"), NULL, &empty_context_); + net::URLRequest request( + GURL("http://blah/"), net::DEFAULT_PRIORITY, NULL, &empty_context_); scoped_refptr<AppCacheURLRequestJob> job; // Create an instance, give it a delivery order and see that @@ -443,8 +446,9 @@ class AppCacheURLRequestJobTest : public testing::Test { base::Unretained(this))); AppCacheStorage* storage = service_->storage(); - request_.reset(empty_context_.CreateRequest( - GURL("http://blah/"), url_request_delegate_.get())); + request_ = empty_context_.CreateRequest(GURL("http://blah/"), + net::DEFAULT_PRIORITY, + url_request_delegate_.get()); // Setup to create an AppCacheURLRequestJob with orders to deliver // a network response. @@ -477,8 +481,9 @@ class AppCacheURLRequestJobTest : public testing::Test { base::Unretained(this))); AppCacheStorage* storage = service_->storage(); - request_.reset(empty_context_.CreateRequest(GURL( - "http://blah/"), url_request_delegate_.get())); + request_ = empty_context_.CreateRequest(GURL("http://blah/"), + net::DEFAULT_PRIORITY, + url_request_delegate_.get()); // Setup to create an AppCacheURLRequestJob with orders to deliver // a network response. @@ -526,8 +531,9 @@ class AppCacheURLRequestJobTest : public testing::Test { void RequestAppCachedResource(bool start_after_delivery_orders) { AppCacheStorage* storage = service_->storage(); - request_.reset(empty_context_.CreateRequest( - GURL("http://blah/"), url_request_delegate_.get())); + request_ = empty_context_.CreateRequest(GURL("http://blah/"), + net::DEFAULT_PRIORITY, + url_request_delegate_.get()); // Setup to create an AppCacheURLRequestJob with orders to deliver // a network response. @@ -639,8 +645,9 @@ class AppCacheURLRequestJobTest : public testing::Test { void MakeRangeRequest() { AppCacheStorage* storage = service_->storage(); - request_.reset(empty_context_.CreateRequest( - GURL("http://blah/"), url_request_delegate_.get())); + request_ = empty_context_.CreateRequest(GURL("http://blah/"), + net::DEFAULT_PRIORITY, + url_request_delegate_.get()); // Request a range, the 3 middle chars out of 'Hello' net::HttpRequestHeaders extra_headers; diff --git a/webkit/browser/blob/blob_url_request_job_factory.cc b/webkit/browser/blob/blob_url_request_job_factory.cc index ed0a400..f36e0a5 100644 --- a/webkit/browser/blob/blob_url_request_job_factory.cc +++ b/webkit/browser/blob/blob_url_request_job_factory.cc @@ -8,6 +8,7 @@ #include "base/compiler_specific.h" #include "base/message_loop/message_loop_proxy.h" #include "base/strings/string_util.h" +#include "net/base/request_priority.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_job_factory.h" #include "webkit/browser/blob/blob_data_handle.h" @@ -28,15 +29,15 @@ BlobDataHandle* GetRequestedBlobDataHandle(net::URLRequest* request) { } // namespace // static -net::URLRequest* BlobProtocolHandler::CreateBlobRequest( +scoped_ptr<net::URLRequest> BlobProtocolHandler::CreateBlobRequest( scoped_ptr<BlobDataHandle> blob_data_handle, const net::URLRequestContext* request_context, net::URLRequest::Delegate* request_delegate) { const GURL kBlobUrl("blob://see_user_data/"); - net::URLRequest* request = request_context->CreateRequest( - kBlobUrl, request_delegate); - SetRequestedBlobDataHandle(request, blob_data_handle.Pass()); - return request; + scoped_ptr<net::URLRequest> request = request_context->CreateRequest( + kBlobUrl, net::DEFAULT_PRIORITY, request_delegate); + SetRequestedBlobDataHandle(request.get(), blob_data_handle.Pass()); + return request.Pass(); } // static diff --git a/webkit/browser/blob/blob_url_request_job_factory.h b/webkit/browser/blob/blob_url_request_job_factory.h index 88ccc64..954aaee 100644 --- a/webkit/browser/blob/blob_url_request_job_factory.h +++ b/webkit/browser/blob/blob_url_request_job_factory.h @@ -34,7 +34,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT BlobProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler { public: // A helper to manufacture an URLRequest to retrieve the given blob. - static net::URLRequest* CreateBlobRequest( + static scoped_ptr<net::URLRequest> CreateBlobRequest( scoped_ptr<BlobDataHandle> blob_data_handle, const net::URLRequestContext* request_context, net::URLRequest::Delegate* request_delegate); |