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

net/tools/quic/quic_server_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_server.h"
 
 #include "net/quic/core/crypto/quic_random.h"
 #include "net/quic/core/quic_utils.h"
 #include "net/quic/platform/api/quic_logging.h"
 #include "net/quic/platform/api/quic_socket_address.h"
@@ skipping 33 matching lines @@
 
   MOCK_METHOD0(OnCanWrite, void());
   MOCK_CONST_METHOD0(HasPendingWrites, bool());
   MOCK_CONST_METHOD0(HasChlosBuffered, bool());
   MOCK_METHOD1(ProcessBufferedChlos, void(size_t));
 };
 
 class TestQuicServer : public QuicServer {
  public:
   TestQuicServer()
-      : QuicServer(CryptoTestUtils::ProofSourceForTesting(), &response_cache_) {
-  }
+      : QuicServer(crypto_test_utils::ProofSourceForTesting(),
+                   &response_cache_) {}
 
   ~TestQuicServer() override {}
 
   MockQuicSimpleDispatcher* mock_dispatcher() { return mock_dispatcher_; }
 
  protected:
   QuicDispatcher* CreateQuicDispatcher() override {
     mock_dispatcher_ = new MockQuicSimpleDispatcher(
         config(), &crypto_config(), version_manager(),
         std::unique_ptr<QuicEpollConnectionHelper>(
@@ skipping 74 matching lines @@
   while (more_chlos) {
     server_.WaitForEvents();
   }
 }
 
 class QuicServerDispatchPacketTest : public ::testing::Test {
  public:
   QuicServerDispatchPacketTest()
       : crypto_config_("blah",
                        QuicRandom::GetInstance(),
-                       CryptoTestUtils::ProofSourceForTesting()),
+                       crypto_test_utils::ProofSourceForTesting()),
         version_manager_(AllSupportedVersions()),
         dispatcher_(
             config_,
             &crypto_config_,
             &version_manager_,
             std::unique_ptr<QuicEpollConnectionHelper>(
                 new QuicEpollConnectionHelper(&eps_,
                                               QuicAllocator::BUFFER_POOL)),
             std::unique_ptr<QuicCryptoServerStream::Helper>(
                 new QuicSimpleCryptoServerStreamHelper(
@@ skipping 37 matching lines @@
       reinterpret_cast<char*>(valid_packet), arraysize(valid_packet),
       QuicTime::Zero(), false);
 
   EXPECT_CALL(dispatcher_, ProcessPacket(_, _, _)).Times(1);
   DispatchPacket(encrypted_valid_packet);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net