Change GetAlternativeServies to return alternative service infos.

net/spdy/chromium/spdy_session_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/spdy/chromium/spdy_session.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
@@ skipping 5619 matching lines @@
   AddSocketData(altsvc_ir);
   AddSSLSocketData();
 
   CreateNetworkSession();
   CreateSecureSpdySession();
 
   base::RunLoop().RunUntilIdle();
 
   const url::SchemeHostPort session_origin("https", test_url_.host(),
                                            test_url_.EffectiveIntPort());
-  AlternativeServiceVector altsvc_vector =
-      spdy_session_pool_->http_server_properties()->GetAlternativeServices(
+  AlternativeServiceInfoVector altsvc_info_vector =
+      spdy_session_pool_->http_server_properties()->GetAlternativeServiceInfos(
           session_origin);
-  ASSERT_TRUE(altsvc_vector.empty());
+  ASSERT_TRUE(altsvc_info_vector.empty());
 
-  altsvc_vector =
-      spdy_session_pool_->http_server_properties()->GetAlternativeServices(
+  altsvc_info_vector =
+      spdy_session_pool_->http_server_properties()->GetAlternativeServiceInfos(
           url::SchemeHostPort(GURL(origin)));
-  ASSERT_EQ(1u, altsvc_vector.size());
-  EXPECT_EQ(kProtoQUIC, altsvc_vector[0].protocol);
-  EXPECT_EQ("alternative.example.org", altsvc_vector[0].host);
-  EXPECT_EQ(443u, altsvc_vector[0].port);
+  ASSERT_EQ(1u, altsvc_info_vector.size());
+  AlternativeService alternative_service(kProtoQUIC, "alternative.example.org",
+                                         443u);
+  EXPECT_EQ(alternative_service, altsvc_info_vector[0].alternative_service);
 }
 
 TEST_F(AltSvcFrameTest, DoNotProcessAltSvcFrameOnInsecureSession) {
   const char origin[] = "https://mail.example.org";
   SpdyAltSvcIR altsvc_ir(/* stream_id = */ 0);
   altsvc_ir.add_altsvc(alternative_service_);
   altsvc_ir.set_origin(origin);
   AddSocketData(altsvc_ir);
   AddSSLSocketData();
 
   CreateNetworkSession();
   CreateInsecureSpdySession();
 
   base::RunLoop().RunUntilIdle();
 
   const url::SchemeHostPort session_origin("https", test_url_.host(),
                                            test_url_.EffectiveIntPort());
-  AlternativeServiceVector altsvc_vector =
-      spdy_session_pool_->http_server_properties()->GetAlternativeServices(
-          session_origin);
-  ASSERT_TRUE(altsvc_vector.empty());
+  ASSERT_TRUE(spdy_session_pool_->http_server_properties()
+                  ->GetAlternativeServiceInfos(session_origin)
+                  .empty());
 
-  altsvc_vector =
-      spdy_session_pool_->http_server_properties()->GetAlternativeServices(
-          url::SchemeHostPort(GURL(origin)));
-  ASSERT_TRUE(altsvc_vector.empty());
+  ASSERT_TRUE(
+      spdy_session_pool_->http_server_properties()
+          ->GetAlternativeServiceInfos(url::SchemeHostPort(GURL(origin)))
+          .empty());
 }
 
 TEST_F(AltSvcFrameTest, DoNotProcessAltSvcFrameForOriginNotCoveredByCert) {
   const char origin[] = "https://invalid.example.org";
   SpdyAltSvcIR altsvc_ir(/* stream_id = */ 0);
   altsvc_ir.add_altsvc(alternative_service_);
   altsvc_ir.set_origin(origin);
   AddSocketData(altsvc_ir);
   AddSSLSocketData();
 
   CreateNetworkSession();
   CreateSecureSpdySession();
 
   base::RunLoop().RunUntilIdle();
 
   const url::SchemeHostPort session_origin("https", test_url_.host(),
                                            test_url_.EffectiveIntPort());
-  AlternativeServiceVector altsvc_vector =
-      spdy_session_pool_->http_server_properties()->GetAlternativeServices(
-          session_origin);
-  ASSERT_TRUE(altsvc_vector.empty());
+  ASSERT_TRUE(spdy_session_pool_->http_server_properties()
+                  ->GetAlternativeServiceInfos(session_origin)
+                  .empty());
 
-  altsvc_vector =
-      spdy_session_pool_->http_server_properties()->GetAlternativeServices(
-          url::SchemeHostPort(GURL(origin)));
-  ASSERT_TRUE(altsvc_vector.empty());
+  ASSERT_TRUE(
+      spdy_session_pool_->http_server_properties()
+          ->GetAlternativeServiceInfos(url::SchemeHostPort(GURL(origin)))
+          .empty());
 }
 
 // An ALTSVC frame on stream 0 with empty origin MUST be ignored.
 // (RFC 7838 Section 4)
 TEST_F(AltSvcFrameTest, DoNotProcessAltSvcFrameWithEmptyOriginOnStreamZero) {
   SpdyAltSvcIR altsvc_ir(/* stream_id = */ 0);
   altsvc_ir.add_altsvc(alternative_service_);
   AddSocketData(altsvc_ir);
   AddSSLSocketData();
 
   CreateNetworkSession();
   CreateSecureSpdySession();
 
   base::RunLoop().RunUntilIdle();
 
   const url::SchemeHostPort session_origin("https", test_url_.host(),
                                            test_url_.EffectiveIntPort());
-  AlternativeServiceVector altsvc_vector =
-      spdy_session_pool_->http_server_properties()->GetAlternativeServices(
-          session_origin);
-  ASSERT_TRUE(altsvc_vector.empty());
+  ASSERT_TRUE(spdy_session_pool_->http_server_properties()
+                  ->GetAlternativeServiceInfos(session_origin)
+                  .empty());
 }
 
 // An ALTSVC frame on a stream other than stream 0 with non-empty origin MUST be
 // ignored.  (RFC 7838 Section 4)
 TEST_F(AltSvcFrameTest,
        DoNotProcessAltSvcFrameWithNonEmptyOriginOnNonZeroStream) {
   SpdyAltSvcIR altsvc_ir(/* stream_id = */ 1);
   altsvc_ir.add_altsvc(alternative_service_);
   altsvc_ir.set_origin("https://mail.example.org");
   AddSocketData(altsvc_ir);
   AddSSLSocketData();
 
   CreateNetworkSession();
   CreateSecureSpdySession();
 
   base::RunLoop().RunUntilIdle();
 
   const url::SchemeHostPort session_origin("https", test_url_.host(),
                                            test_url_.EffectiveIntPort());
-  AlternativeServiceVector altsvc_vector =
-      spdy_session_pool_->http_server_properties()->GetAlternativeServices(
-          session_origin);
-  ASSERT_TRUE(altsvc_vector.empty());
+  ASSERT_TRUE(spdy_session_pool_->http_server_properties()
+                  ->GetAlternativeServiceInfos(session_origin)
+                  .empty());
 }
 
 TEST_F(AltSvcFrameTest, ProcessAltSvcFrameOnActiveStream) {
   SpdyAltSvcIR altsvc_ir(/* stream_id = */ 1);
   altsvc_ir.add_altsvc(alternative_service_);
 
   SpdySerializedFrame altsvc_frame(spdy_util_.SerializeFrame(altsvc_ir));
   SpdySerializedFrame rst(
       spdy_util_.ConstructSpdyRstStream(1, ERROR_CODE_REFUSED_STREAM));
   MockRead reads[] = {
@@ skipping 22 matching lines @@
   spdy_stream1->SetDelegate(&delegate1);
 
   SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(request_origin));
 
   spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
 
   base::RunLoop().RunUntilIdle();
 
   const url::SchemeHostPort session_origin("https", test_url_.host(),
                                            test_url_.EffectiveIntPort());
-  AlternativeServiceVector altsvc_vector =
-      spdy_session_pool_->http_server_properties()->GetAlternativeServices(
-          session_origin);
-  ASSERT_TRUE(altsvc_vector.empty());
+  ASSERT_TRUE(spdy_session_pool_->http_server_properties()
+                  ->GetAlternativeServiceInfos(session_origin)
+                  .empty());
 
-  altsvc_vector =
-      spdy_session_pool_->http_server_properties()->GetAlternativeServices(
+  AlternativeServiceInfoVector altsvc_info_vector =
+      spdy_session_pool_->http_server_properties()->GetAlternativeServiceInfos(
           url::SchemeHostPort(GURL(request_origin)));
-  ASSERT_EQ(1u, altsvc_vector.size());
-  EXPECT_EQ(kProtoQUIC, altsvc_vector[0].protocol);
-  EXPECT_EQ("alternative.example.org", altsvc_vector[0].host);
-  EXPECT_EQ(443u, altsvc_vector[0].port);
+  ASSERT_EQ(1u, altsvc_info_vector.size());
+  EXPECT_EQ(kProtoQUIC, altsvc_info_vector[0].alternative_service.protocol);
+  EXPECT_EQ("alternative.example.org",
+            altsvc_info_vector[0].alternative_service.host);
+  EXPECT_EQ(443u, altsvc_info_vector[0].alternative_service.port);
 }
 
 TEST_F(AltSvcFrameTest, DoNotProcessAltSvcFrameOnStreamWithInsecureOrigin) {
   SpdyAltSvcIR altsvc_ir(/* stream_id = */ 1);
   altsvc_ir.add_altsvc(alternative_service_);
 
   SpdySerializedFrame altsvc_frame(spdy_util_.SerializeFrame(altsvc_ir));
   SpdySerializedFrame rst(
       spdy_util_.ConstructSpdyRstStream(1, ERROR_CODE_REFUSED_STREAM));
   MockRead reads[] = {
@@ skipping 22 matching lines @@
   spdy_stream1->SetDelegate(&delegate1);
 
   SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(request_origin));
 
   spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
 
   base::RunLoop().RunUntilIdle();
 
   const url::SchemeHostPort session_origin("https", test_url_.host(),
                                            test_url_.EffectiveIntPort());
-  AlternativeServiceVector altsvc_vector =
-      spdy_session_pool_->http_server_properties()->GetAlternativeServices(
-          session_origin);
-  ASSERT_TRUE(altsvc_vector.empty());
+  ASSERT_TRUE(spdy_session_pool_->http_server_properties()
+                  ->GetAlternativeServiceInfos(session_origin)
+                  .empty());
 
-  altsvc_vector =
-      spdy_session_pool_->http_server_properties()->GetAlternativeServices(
-          url::SchemeHostPort(GURL(request_origin)));
-  ASSERT_TRUE(altsvc_vector.empty());
+  ASSERT_TRUE(spdy_session_pool_->http_server_properties()
+                  ->GetAlternativeServiceInfos(
+                      url::SchemeHostPort(GURL(request_origin)))
+                  .empty());
 }
 
 TEST_F(AltSvcFrameTest, DoNotProcessAltSvcFrameOnNonExistentStream) {
   SpdyAltSvcIR altsvc_ir(/* stream_id = */ 1);
   altsvc_ir.add_altsvc(alternative_service_);
   AddSocketData(altsvc_ir);
   AddSSLSocketData();
 
   CreateNetworkSession();
   CreateSecureSpdySession();
 
   base::RunLoop().RunUntilIdle();
 
   const url::SchemeHostPort session_origin("https", test_url_.host(),
                                            test_url_.EffectiveIntPort());
-  AlternativeServiceVector altsvc_vector =
-      spdy_session_pool_->http_server_properties()->GetAlternativeServices(
-          session_origin);
-  ASSERT_TRUE(altsvc_vector.empty());
+  ASSERT_TRUE(spdy_session_pool_->http_server_properties()
+                  ->GetAlternativeServiceInfos(session_origin)
+                  .empty());
 }
 
 TEST(MapFramerErrorToProtocolError, MapsValues) {
   CHECK_EQ(
       SPDY_ERROR_INVALID_CONTROL_FRAME,
       MapFramerErrorToProtocolError(SpdyFramer::SPDY_INVALID_CONTROL_FRAME));
   CHECK_EQ(
       SPDY_ERROR_INVALID_DATA_FRAME_FLAGS,
       MapFramerErrorToProtocolError(SpdyFramer::SPDY_INVALID_DATA_FRAME_FLAGS));
   CHECK_EQ(
@@ skipping 264 matching lines @@
   ssl_info.cert = ImportCertFromFile(GetTestCertsDirectory(),
                                      "spdy_pooling.pem");
   ssl_info.is_issued_by_known_root = true;
   ssl_info.public_key_hashes.push_back(test::GetTestHashValue(primary_pin));
 
   EXPECT_TRUE(SpdySession::CanPool(
       &tss, ssl_info, "www.example.org", "mail.example.org"));
 }
 
 }  // namespace net