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

net/quic/core/quic_client_promised_info_test.cc

 // Copyright 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/quic/core/quic_client_promised_info.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "net/quic/core/spdy_utils.h"
@@ skipping 14 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()),
         authorized_(true) {}
   ~MockQuicClientSession() override {}
 
   bool IsAuthorized(const string& authority) override { return authorized_; }
 
   void set_authorized(bool authorized) { authorized_ = authorized; }
 
   MOCK_METHOD1(CloseStream, void(QuicStreamId stream_id));
 
  private:
@@ skipping 258 matching lines @@
   EXPECT_FALSE(delegate.rendezvous_fired());
   EXPECT_EQ(delegate.rendezvous_stream(), nullptr);
 
   // Promise is gone
   EXPECT_EQ(session_.GetPromisedById(promise_id_), nullptr);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net