Change the AlternativeServiceMap with SchemeOriginPair key.

content/browser/loader/resource_scheduler_unittest.cc

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 12200b8712762006ac2f35879ba572ad2e95df7a..f95a0f04c0c2edf945de7eb4bbe7218b95239ad7 100644
--- a/content/browser/loader/resource_scheduler_unittest.cc
+++ b/content/browser/loader/resource_scheduler_unittest.cc
@@ -331,7 +331,7 @@ TEST_F(ResourceSchedulerTest, LowDoesNotBlockCriticalComplete) {
 
 TEST_F(ResourceSchedulerTest, OneLowLoadsUntilBodyInsertedExceptSpdy) {
   http_server_properties_.SetSupportsSpdy(
-      net::HostPortPair("spdyhost", 443), true);
+      url::SchemeHostPort("https", "spdyhost", 443), true);
   scoped_ptr<TestRequest> high(NewRequest("http://host/high", net::HIGHEST));
   scoped_ptr<TestRequest> low_spdy(
       NewRequest("https://spdyhost/low", net::LOWEST));
@@ -636,7 +636,7 @@ TEST_F(ResourceSchedulerTest, NewSpdyHostInDelayableRequests) {
   scoped_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());
@@ -648,7 +648,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();
   scoped_ptr<TestRequest> low2(NewRequest("http://host/low", net::LOWEST));
@@ -687,7 +687,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;