Land Recent QUIC Changes.

net/quic/quic_session_test.cc

 // 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.
 
 #include "net/quic/quic_session.h"
 
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 562 matching lines @@
   }
   ValueRestore<bool> old_flag(&FLAGS_enable_quic_stream_flow_control, true);
 
   // Ensure that Writev consumes all the data it is given (simulate no socket
   // blocking).
   session_.set_writev_consumes_all_data(true);
 
   // Create a stream, and send enough data to make it flow control blocked.
   TestStream* stream2 = session_.CreateOutgoingDataStream();
   string body(kDefaultFlowControlSendWindow, '.');
-  EXPECT_FALSE(stream2->IsFlowControlBlocked());
+  EXPECT_FALSE(stream2->flow_controller()->IsBlocked());
   stream2->SendBody(body, false);
-  EXPECT_TRUE(stream2->IsFlowControlBlocked());
+  EXPECT_TRUE(stream2->flow_controller()->IsBlocked());
 
   // Now complete the crypto handshake, resulting in an increased flow control
   // send window.
   CryptoHandshakeMessage msg;
   session_.GetCryptoStream()->OnHandshakeMessage(msg);
 
   // Stream is now unblocked.
-  EXPECT_FALSE(stream2->IsFlowControlBlocked());
+  EXPECT_FALSE(stream2->flow_controller()->IsBlocked());
 }
 
 TEST_P(QuicSessionTest, InvalidFlowControlWindowInHandshake) {
   // Test that receipt of an invalid (< default) flow control window from peer
   // results in the connection being torn down.
   if (version() < QUIC_VERSION_17) {
     return;
   }
   ValueRestore<bool> old_flag(&FLAGS_enable_quic_stream_flow_control, true);
 
@@ skipping 10 matching lines @@
   EXPECT_CALL(*connection_, SendConnectionClose(QUIC_FLOW_CONTROL_ERROR));
   string expected_error("Peer sent us an invalid flow control send window: ");
   expected_error.append(reinterpret_cast<const char*>(&kInvalidWindow),
                         sizeof(kInvalidWindow));
   EXPECT_DFATAL(session_.OnConfigNegotiated(), expected_error);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net