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

  + Formatting changes found while merging.
  + Added private: to MockAckNotifierDelegate class.

Merge internal change: 89527377

R=rch@chromium.org

Review URL: https://codereview.chromium.org/1034823002

Cr-Commit-Position: refs/heads/master@{#322287}

net/quic/quic_time_wait_list_manager.h

@@ -174,8 +174,7 @@ class QuicTimeWaitListManager : public QuicBlockedWriterInterface {
   const QuicTime::Delta time_wait_period_;
 
   // Alarm registered with the connection helper to clean up connection_ids that
-  // have
-  // out lived their duration in time wait state.
+  // have out lived their duration in time wait state.
   scoped_ptr<QuicAlarm> connection_id_clean_up_alarm_;
 
   // Interface that writes given buffer to the socket.

net/tools/quic/test_tools/quic_test_utils.cc

@@ -123,12 +123,11 @@ MockTimeWaitListManager::MockTimeWaitListManager(
                               QuicSupportedVersions()) {
   // Though AddConnectionIdToTimeWait is mocked, we want to retain its
   // functionality.
-  EXPECT_CALL(*this, AddConnectionIdToTimeWait(_, _, _))
-    .Times(AnyNumber());
+  EXPECT_CALL(*this, AddConnectionIdToTimeWait(_, _, _)).Times(AnyNumber());
   ON_CALL(*this, AddConnectionIdToTimeWait(_, _, _))
-    .WillByDefault(Invoke(this,
-                          &MockTimeWaitListManager::
-                          QuicTimeWaitListManager_AddConnectionIdToTimeWait));
+      .WillByDefault(
+          Invoke(this, &MockTimeWaitListManager::
+                           QuicTimeWaitListManager_AddConnectionIdToTimeWait));
 }
 
 MockTimeWaitListManager::~MockTimeWaitListManager() {

net/tools/quic/test_tools/quic_test_utils.h

@@ -106,6 +106,7 @@ class MockAckNotifierDelegate : public QuicAckNotifier::DelegateInterface {
   // Object is ref counted.
   virtual ~MockAckNotifierDelegate();
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(MockAckNotifierDelegate);
 };