Landing Recent QUIC changes until 5:30 PM, Feb 3, 2017 UTC-5

net/tools/quic/quic_spdy_client_stream_test.cc

 // Copyright 2013 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/tools/quic/quic_spdy_client_stream.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "net/quic/core/quic_utils.h"
@@ skipping 20 matching lines @@
 class MockQuicClientSession : public QuicClientSession {
  public:
   explicit MockQuicClientSession(QuicConnection* connection,
                                  QuicClientPushPromiseIndex* push_promise_index)
       : QuicClientSession(
             DefaultQuicConfig(),
             connection,
             QuicServerId("example.com", 443, PRIVACY_MODE_DISABLED),
             &crypto_config_,
             push_promise_index),
-        crypto_config_(CryptoTestUtils::ProofVerifierForTesting()) {}
+        crypto_config_(crypto_test_utils::ProofVerifierForTesting()) {}
   ~MockQuicClientSession() override {}
 
   MOCK_METHOD1(CloseStream, void(QuicStreamId stream_id));
 
  private:
   QuicCryptoClientConfig crypto_config_;
 
   DISALLOW_COPY_AND_ASSIGN(MockQuicClientSession);
 };
 
@@ skipping 145 matching lines @@
   // Now send the body, which should close the stream as the FIN has been
   // received, as well as all data.
   EXPECT_CALL(session_, CloseStream(stream_->id()));
   stream_->OnStreamFrame(
       QuicStreamFrame(stream_->id(), /*fin=*/false, /*offset=*/0, body_));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net