Fix SpdySessionKey for HTTP/2 alternative Jobs.

net/http/http_stream_factory_impl_job_controller_unittest.cc

 // Copyright (c) 2016 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/http/http_stream_factory_impl_job_controller.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
+#include "base/strings/stringprintf.h"
 #include "base/test/histogram_tester.h"
 #include "base/test/scoped_feature_list.h"
 #include "base/test/scoped_mock_time_message_loop_task_runner.h"
 #include "base/threading/platform_thread.h"
 #include "net/base/test_proxy_delegate.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/http/http_basic_stream.h"
 #include "net/http/http_stream_factory_impl_job.h"
 #include "net/http/http_stream_factory_impl_request.h"
 #include "net/http/http_stream_factory_test_util.h"
@@ skipping 112 matching lines @@
     // Start() is mocked for MockHttpStreamFactoryImplJob.
     // This is the alternative method to invoke real Start() method on Job.
     job->stream_type_ = stream_type;
     job->StartInternal();
   }
 
   // Returns |num_streams_| of |job|. It should be 0 for non-preconnect Jobs.
   static int GetNumStreams(const HttpStreamFactoryImpl::Job* job) {
     return job->num_streams_;
   }
+
+  // Return SpdySessionKey of |job|.
+  static const SpdySessionKey GetSpdySessionKey(
+      const HttpStreamFactoryImpl::Job* job) {
+    return job->GetSpdySessionKey();
+  }
 };
 
 class JobControllerPeer {
  public:
   static bool main_job_is_blocked(
       HttpStreamFactoryImpl::JobController* job_controller) {
     return job_controller->main_job_is_blocked_;
   }
   static bool main_job_is_resumed(
       HttpStreamFactoryImpl::JobController* job_controller) {
@@ skipping 564 matching lines @@
   EXPECT_TRUE(job_controller_->alternative_job());
 
   // Invoke OnRequestComplete() which should delete |job_controller_| from
   // |factory_|.
   request_.reset();
   VerifyBrokenAlternateProtocolMapping(request_info, false);
   // This fails without the fix for crbug.com/678768.
   EXPECT_TRUE(HttpStreamFactoryImplPeer::IsJobControllerDeleted(factory_));
 }
 
+TEST_F(HttpStreamFactoryImplJobControllerTest,
+       SpdySessionKeyHasOriginHostPortPair) {
+  session_deps_.enable_http2_alternative_service = true;
+
+  const char origin_host[] = "www.example.org";
+  const uint16_t origin_port = 443;
+  const char alternative_host[] = "mail.example.org";
+  const uint16_t alternative_port = 123;
+
+  HttpRequestInfo request_info;
+  request_info.method = "GET";
+  request_info.url =
+      GURL(base::StringPrintf("https://%s:%u", origin_host, origin_port));
+  Initialize(request_info);
+
+  url::SchemeHostPort server(request_info.url);
+  AlternativeService alternative_service(kProtoHTTP2, alternative_host,
+                                         alternative_port);
+  SetAlternativeService(request_info, alternative_service);
+
+  request_.reset(
+      job_controller_->Start(&request_delegate_, nullptr, NetLogWithSource(),
+                             HttpStreamRequest::HTTP_STREAM, DEFAULT_PRIORITY));
+
+  HostPortPair main_host_port_pair =
+      HttpStreamFactoryImplJobPeer::GetSpdySessionKey(
+          job_controller_->main_job())
+          .host_port_pair();
+  EXPECT_EQ(origin_host, main_host_port_pair.host());
+  EXPECT_EQ(origin_port, main_host_port_pair.port());
+
+  HostPortPair alternative_host_port_pair =
+      HttpStreamFactoryImplJobPeer::GetSpdySessionKey(
+          job_controller_->alternative_job())
+          .host_port_pair();
+  EXPECT_EQ(origin_host, alternative_host_port_pair.host());
+  EXPECT_EQ(origin_port, alternative_host_port_pair.port());
+}
+
 // Tests that if an orphaned job completes after |request_| is gone,
 // JobController will be cleaned up.
 TEST_F(HttpStreamFactoryImplJobControllerTest,
        OrphanedJobCompletesControllerDestroyed) {
   quic_data_ = base::MakeUnique<test::MockQuicData>();
   quic_data_->AddRead(SYNCHRONOUS, ERR_IO_PENDING);
   // Use cold start and complete alt job manually.
   crypto_client_stream_factory_.set_handshake_mode(
       MockCryptoClientStream::COLD_START);
 
@@ skipping 830 matching lines @@
   Preconnect(kNumPreconects);
   // If experiment is enabled, only 1 stream is requested.
   EXPECT_EQ(
       (int)actual_num_connects,
       HttpStreamFactoryImplJobPeer::GetNumStreams(job_controller_->main_job()));
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(HttpStreamFactoryImplPeer::IsJobControllerDeleted(factory_));
 }
 
 }  // namespace net