Change --origin-port-to-force-quic-on to --origin-to-force-quic-on.

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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "net/base/capturing_net_log.h"
 #include "net/base/net_log_unittest.h"
@@ skipping 309 matching lines @@
   scoped_ptr<QuicSpdyCompressor> compressor_;
   scoped_ptr<HttpAuthHandlerFactory> auth_handler_factory_;
   MockRandom random_generator_;
   HttpServerPropertiesImpl http_server_properties;
   HttpNetworkSession::Params params_;
   HttpRequestInfo request_;
   CapturingBoundNetLog net_log_;
 };
 
 TEST_F(QuicNetworkTransactionTest, ForceQuic) {
-  params_.origin_port_to_force_quic_on = 80;
+  params_.origin_to_force_quic_on =
+      HostPortPair::FromString("www.google.com:80");
 
   QuicStreamId stream_id = 3;
   scoped_ptr<QuicEncryptedPacket> req(
       ConstructDataPacket(1, stream_id, true, true, 0,
                           GetRequestString("GET", "/")));
   scoped_ptr<QuicEncryptedPacket> ack(ConstructAckPacket(1, 0));
 
   MockWrite quic_writes[] = {
     MockWrite(SYNCHRONOUS, req->data(), req->length()),
     MockWrite(SYNCHRONOUS, ack->data(), ack->length()),
@@ skipping 52 matching lines @@
       net::NetLog::TYPE_QUIC_SESSION_STREAM_FRAME_RECEIVED,
       net::NetLog::PHASE_NONE);
   EXPECT_LT(0, pos);
 
   int log_stream_id;
   ASSERT_TRUE(entries[pos].GetIntegerValue("stream_id", &log_stream_id));
   EXPECT_EQ(stream_id, static_cast<QuicStreamId>(log_stream_id));
 }
 
 TEST_F(QuicNetworkTransactionTest, ForceQuicWithErrorConnecting) {
-  params_.origin_port_to_force_quic_on = 80;
+  params_.origin_to_force_quic_on =
+      HostPortPair::FromString("www.google.com:80");
 
   MockRead quic_reads[] = {
     MockRead(ASYNC, ERR_SOCKET_NOT_CONNECTED),
   };
   StaticSocketDataProvider quic_data(quic_reads, arraysize(quic_reads),
                                      NULL, 0);
   socket_factory_.AddSocketDataProvider(&quic_data);
 
   CreateSession();
 
   scoped_ptr<HttpNetworkTransaction> trans(
       new HttpNetworkTransaction(DEFAULT_PRIORITY, session_.get()));
   TestCompletionCallback callback;
   int rv = trans->Start(&request_, callback.callback(), net_log_.bound());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_EQ(ERR_SOCKET_NOT_CONNECTED, callback.WaitForResult());
 }
 
 TEST_F(QuicNetworkTransactionTest, DoNotForceQuicForHttps) {
   // Attempt to "force" quic on 443, which will not be honored.
-  params_.origin_port_to_force_quic_on = 443;
+  params_.origin_to_force_quic_on =
+      HostPortPair::FromString("www.google.com:443");
 
   MockRead http_reads[] = {
     MockRead("HTTP/1.1 200 OK\r\n\r\n"),
     MockRead("hello world"),
     MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),
     MockRead(ASYNC, OK)
   };
 
   StaticSocketDataProvider data(http_reads, arraysize(http_reads), NULL, 0);
   socket_factory_.AddSocketDataProvider(&data);
@@ skipping 175 matching lines @@
 
   CreateSession();
 
   AddQuicAlternateProtocolMapping(MockCryptoClientStream::COLD_START);
   SendRequestAndExpectHttpResponse("hello from http");
   ExpectBrokenAlternateProtocolMapping();
 }
 
 }  // namespace test
 }  // namespace net