Rename FLAGS_enable_quic_connection_flow_control to FLAGS_enable_quic_connection_flow_control_2, an…

net/quic/quic_session_test.cc

Index: net/quic/quic_session_test.cc
diff --git a/net/quic/quic_session_test.cc b/net/quic/quic_session_test.cc
index d5468e7f2c0609c1fec6e4818d751133b1c04844..2dc5c4d41f81492f7f2137acc069472e13ca44b3 100644
--- a/net/quic/quic_session_test.cc
+++ b/net/quic/quic_session_test.cc
@@ -515,7 +515,8 @@ TEST_P(QuicSessionTest, OnCanWriteWithClosedStream) {
 }
 
 TEST_P(QuicSessionTest, OnCanWriteLimitsNumWritesIfFlowControlBlocked) {
-  ValueRestore<bool> old_flag(&FLAGS_enable_quic_connection_flow_control, true);
+  ValueRestore<bool> old_flag(&FLAGS_enable_quic_connection_flow_control_2,
+                              true);
   if (version() < QUIC_VERSION_19) {
     return;
   }
@@ -684,7 +685,7 @@ TEST_P(QuicSessionTest, InvalidFlowControlWindow) {
 
 TEST_P(QuicSessionTest, ConnectionFlowControlAccountingRstOutOfOrder) {
   FLAGS_enable_quic_stream_flow_control_2 = true;

[ramant (doing other things), 2014/06/17 21:58:56]

hi rjshade,
  This CL would have conflicts with the following CL. We need to restore the
FLAGs old value after the unit test (because they are globals).

https://codereview.chromium.org/330333006/diff/120001/net/quic/quic_session_t...

ValueRestore<bool> old_flag2(&FLAGS_enable_quic_stream_flow_control_2, true);
ValueRestore<bool> old_flag(&FLAGS_enable_quic_connection_flow_control, true);

[Robbie Shade, 2014/06/17 22:06:18]

Done.

-  FLAGS_enable_quic_connection_flow_control = true;
+  FLAGS_enable_quic_connection_flow_control_2 = true;
   if (version() < QUIC_VERSION_19) {
     return;
   }
@@ -712,7 +713,7 @@ TEST_P(QuicSessionTest, ConnectionFlowControlAccountingRstOutOfOrder) {
 
 TEST_P(QuicSessionTest, ConnectionFlowControlAccountingFinAndLocalReset) {
   FLAGS_enable_quic_stream_flow_control_2 = true;
-  FLAGS_enable_quic_connection_flow_control = true;
+  FLAGS_enable_quic_connection_flow_control_2 = true;
   if (version() < QUIC_VERSION_19) {
     return;
   }
@@ -752,7 +753,7 @@ TEST_P(QuicSessionTest, ConnectionFlowControlAccountingFinAfterRst) {
   // Test that when we RST the stream (and tear down stream state), and then
   // receive a FIN from the peer, we correctly adjust our connection level flow
   // control receive window.
-  FLAGS_enable_quic_connection_flow_control = true;
+  FLAGS_enable_quic_connection_flow_control_2 = true;
   if (version() < QUIC_VERSION_19) {
     return;
   }
@@ -795,7 +796,7 @@ TEST_P(QuicSessionTest, ConnectionFlowControlAccountingRstAfterRst) {
   // Test that when we RST the stream (and tear down stream state), and then
   // receive a RST from the peer, we correctly adjust our connection level flow
   // control receive window.
-  FLAGS_enable_quic_connection_flow_control = true;
+  FLAGS_enable_quic_connection_flow_control_2 = true;
   if (version() < QUIC_VERSION_19) {
     return;
   }
@@ -835,7 +836,7 @@ TEST_P(QuicSessionTest, FlowControlWithInvalidFinalOffset) {
     return;
   }
   FLAGS_enable_quic_stream_flow_control_2 = true;
-  FLAGS_enable_quic_connection_flow_control = true;
+  FLAGS_enable_quic_connection_flow_control_2 = true;
 
   const uint64 kLargeOffset = kInitialFlowControlWindowForTest + 1;
   EXPECT_CALL(*connection_,
@@ -860,7 +861,7 @@ TEST_P(QuicSessionTest, VersionNegotiationDisablesFlowControl) {
   ValueRestore<bool> old_stream_flag(
       &FLAGS_enable_quic_stream_flow_control_2, true);
   ValueRestore<bool> old_connection_flag(
-      &FLAGS_enable_quic_connection_flow_control, true);
+      &FLAGS_enable_quic_connection_flow_control_2, true);
   if (version() < QUIC_VERSION_19) {
     return;
   }