QUIC - minor changes found while merging with the internal source.

net/tools/quic/test_tools/quic_test_utils.h

 // 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.
 
 // Common utilities for Quic tests
 
 #ifndef NET_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_UTILS_H_
 #define NET_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_UTILS_H_
 
 #include <string>
@@ skipping 88 matching lines @@
 
   MOCK_METHOD3(OnAckNotification,
                void(int num_retransmitted_packets,
                     int num_retransmitted_bytes,
                     QuicTime::Delta delta_largest_observed));
 
  protected:
   // Object is ref counted.
   virtual ~MockAckNotifierDelegate();
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(MockAckNotifierDelegate);
 };
 
 // Creates per-connection packet writers that register themselves with the
 // TestWriterFactory on each write so that TestWriterFactory::OnPacketSent can
 // be routed to the appropriate QuicConnection.
 class TestWriterFactory : public QuicDispatcher::PacketWriterFactory {
  public:
   TestWriterFactory();
   ~TestWriterFactory() override;
@@ skipping 56 matching lines @@
                     QuicConnectionId connection_id,
                     QuicPacketSequenceNumber sequence_number,
                     const QuicEncryptedPacket& packet));
 };
 
 }  // namespace test
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_UTILS_H_