Landing Recent QUIC Changes.

net/quic/quic_stream_factory_test.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/quic/quic_stream_factory.h"
 
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "net/base/test_data_directory.h"
 #include "net/cert/cert_verifier.h"
@@ skipping 82 matching lines @@
         clock_(new MockClock()),
         cert_verifier_(CertVerifier::CreateDefault()),
         channel_id_service_(new ChannelIDService(
             new DefaultChannelIDStore(NULL),
             base::MessageLoopProxy::current())),
         factory_(&host_resolver_, &socket_factory_,
                  base::WeakPtr<HttpServerProperties>(), cert_verifier_.get(),
                  channel_id_service_.get(), &transport_security_state_,
                  &crypto_client_stream_factory_, &random_generator_, clock_,
                  kDefaultMaxPacketSize, std::string(),
-                 SupportedVersions(GetParam()), true, true, true,
-                 QuicTagVector()),
+                 SupportedVersions(GetParam()), true, true, QuicTagVector()),
         host_port_pair_(kDefaultServerHostName, kDefaultServerPort),
         is_https_(false),
         privacy_mode_(PRIVACY_MODE_DISABLED) {
     factory_.set_require_confirmation(false);
   }
 
   scoped_ptr<QuicHttpStream> CreateIfSessionExists(
       const HostPortPair& host_port_pair,
       const BoundNetLog& net_log) {
     return QuicStreamFactoryPeer::CreateIfSessionExists(
@@ skipping 1036 matching lines @@
     QuicCryptoClientConfig::CachedState* cached2 =
         crypto_config->LookupOrCreate(server_id2);
     EXPECT_NE(cached1->source_address_token(), cached2->source_address_token());
     EXPECT_TRUE(cached2->source_address_token().empty());
     EXPECT_FALSE(cached2->proof_valid());
   }
 }
 
 }  // namespace test
 }  // namespace net