Landing Recent QUIC changes until Sun May 8 00:39:29 2016 +0000

net/quic/quic_flow_controller_test.cc

 // Copyright 2014 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/quic_flow_controller.h"
 
 #include <memory>
 
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
@@ skipping 26 matching lines @@
     flow_controller_.reset(
         new QuicFlowController(&connection_, stream_id_, Perspective::IS_CLIENT,
                                send_window_, receive_window_, false));
   }
 
  protected:
   QuicStreamId stream_id_;
   QuicByteCount send_window_;
   QuicByteCount receive_window_;
   std::unique_ptr<QuicFlowController> flow_controller_;
-  MockConnectionHelper helper_;
+  MockQuicConnectionHelper helper_;
   MockAlarmFactory alarm_factory_;
-  MockConnection connection_;
+  MockQuicConnection connection_;
 };
 
 TEST_F(QuicFlowControllerTest, SendingBytes) {
   Initialize();
 
   EXPECT_FALSE(flow_controller_->IsBlocked());
   EXPECT_FALSE(flow_controller_->FlowControlViolation());
   EXPECT_EQ(send_window_, flow_controller_->SendWindowSize());
 
   // Send some bytes, but not enough to block.
@@ skipping 310 matching lines @@
   EXPECT_FALSE(flow_controller_->FlowControlViolation());
 
   QuicByteCount new_threshold =
       QuicFlowControllerPeer::WindowUpdateThreshold(flow_controller_.get());
 
   EXPECT_EQ(new_threshold, threshold);
 }
 
 }  // namespace test
 }  // namespace net