Make GetAlternateProtocol return AlternativeService.

net/quic/quic_network_transaction_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 <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
@@ skipping 282 matching lines @@
 
   void AddQuicAlternateProtocolMapping(
       MockCryptoClientStream::HandshakeMode handshake_mode) {
     crypto_client_stream_factory_.set_handshake_mode(handshake_mode);
     session_->http_server_properties()->SetAlternateProtocol(
         HostPortPair::FromURL(request_.url), 80, QUIC, 1);
   }
 
   void ExpectBrokenAlternateProtocolMapping() {
     const HostPortPair origin = HostPortPair::FromURL(request_.url);
-    const AlternateProtocolInfo alternate =
-        session_->http_server_properties()->GetAlternateProtocol(origin);
-    EXPECT_NE(UNINITIALIZED_ALTERNATE_PROTOCOL, alternate.protocol);
-    const AlternativeService alternative_service(alternate.protocol,
-                                                 origin.host(), alternate.port);
+    const AlternativeService alternative_service =
+        session_->http_server_properties()->GetAlternativeService(origin);
+    EXPECT_NE(UNINITIALIZED_ALTERNATE_PROTOCOL, alternative_service.protocol);
     EXPECT_TRUE(session_->http_server_properties()->IsAlternativeServiceBroken(
         alternative_service));
   }
 
   void ExpectQuicAlternateProtocolMapping() {
-    const AlternateProtocolInfo alternate =
-        session_->http_server_properties()->GetAlternateProtocol(
+    const AlternativeService alternative_service =
+        session_->http_server_properties()->GetAlternativeService(
             HostPortPair::FromURL(request_.url));
-    EXPECT_EQ(QUIC, alternate.protocol);
+    EXPECT_EQ(QUIC, alternative_service.protocol);
   }
 
   void AddHangingNonAlternateProtocolSocketData() {
     MockConnect hanging_connect(SYNCHRONOUS, ERR_IO_PENDING);
     hanging_data_.set_connect_data(hanging_connect);
     socket_factory_.AddSocketDataProvider(&hanging_data_);
   }
 
   MockClock* clock_;  // Owned by QuicStreamFactory after CreateSession.
   QuicTestPacketMaker maker_;
@@ skipping 740 matching lines @@
                          nullptr,
                          net_log_.bound());
 
   CreateSessionWithNextProtos();
   AddQuicAlternateProtocolMapping(MockCryptoClientStream::ZERO_RTT);
   SendRequestAndExpectHttpResponse("hello world");
 }
 
 }  // namespace test
 }  // namespace net