| Index: content/browser/loader/resource_scheduler_unittest.cc
|
| diff --git a/content/browser/loader/resource_scheduler_unittest.cc b/content/browser/loader/resource_scheduler_unittest.cc
|
| index 98003ce76adb6bee9ad5b64970f197f1bc5df8a3..82294de79f870c820bc3e70dce114ab55fccef11 100644
|
| --- a/content/browser/loader/resource_scheduler_unittest.cc
|
| +++ b/content/browser/loader/resource_scheduler_unittest.cc
|
| @@ -337,7 +337,7 @@ TEST_F(ResourceSchedulerTest, LowDoesNotBlockCriticalComplete) {
|
|
|
| TEST_F(ResourceSchedulerTest, OneLowLoadsUntilBodyInsertedExceptSpdy) {
|
| http_server_properties_.SetSupportsSpdy(
|
| - net::HostPortPair("spdyhost", 443), true);
|
| + url::SchemeHostPort("https", "spdyhost", 443), true);
|
| std::unique_ptr<TestRequest> high(
|
| NewRequest("http://host/high", net::HIGHEST));
|
| std::unique_ptr<TestRequest> low_spdy(
|
| @@ -665,7 +665,7 @@ TEST_F(ResourceSchedulerTest, NewSpdyHostInDelayableRequests) {
|
| std::unique_ptr<TestRequest> low1(NewRequest("http://host/low", net::LOWEST));
|
| EXPECT_FALSE(low1->started());
|
| http_server_properties_.SetSupportsSpdy(
|
| - net::HostPortPair("spdyhost1", 8080), true);
|
| + url::SchemeHostPort("http", "spdyhost1", 8080), true);
|
| low1_spdy.reset();
|
| base::RunLoop().RunUntilIdle();
|
| EXPECT_TRUE(low1->started());
|
| @@ -677,7 +677,7 @@ TEST_F(ResourceSchedulerTest, NewSpdyHostInDelayableRequests) {
|
| // Reprioritize a request after we learn the server supports SPDY.
|
| EXPECT_TRUE(low2_spdy->started());
|
| http_server_properties_.SetSupportsSpdy(
|
| - net::HostPortPair("spdyhost2", 8080), true);
|
| + url::SchemeHostPort("http", "spdyhost2", 8080), true);
|
| ChangeRequestPriority(low2_spdy.get(), net::LOWEST);
|
| base::RunLoop().RunUntilIdle();
|
| std::unique_ptr<TestRequest> low2(NewRequest("http://host/low", net::LOWEST));
|
| @@ -716,7 +716,7 @@ TEST_F(ResourceSchedulerTest,
|
| InitializeScheduler();
|
|
|
| http_server_properties_.SetSupportsSpdy(
|
| - net::HostPortPair("spdyhost", 443), true);
|
| + url::SchemeHostPort("https", "spdyhost", 443), true);
|
|
|
| // Throw in requests up to the above limit; make sure they are started.
|
| ScopedVector<TestRequest> requests;
|
|
|