Landing Recent QUIC changes until 4AM, Aug 7, 2016 UTC-4

net/quic/core/quic_headers_stream_test.cc

Index: net/quic/core/quic_headers_stream_test.cc
diff --git a/net/quic/core/quic_headers_stream_test.cc b/net/quic/core/quic_headers_stream_test.cc
index 00fd09d91b4769ed2aac599499f8b7215d4b35d7..59f300e044ebae0e41cd8681c36366b188ef02ff 100644
--- a/net/quic/core/quic_headers_stream_test.cc
+++ b/net/quic/core/quic_headers_stream_test.cc
@@ -40,7 +40,7 @@ using testing::_;
 // TODO(bnc): Merge these correctly.
 bool FLAGS_use_http2_frame_decoder_adapter;
 bool FLAGS_spdy_use_hpack_decoder2;
-bool FLAGS_spdy_framer_use_new_methods2;
+bool FLAGS_spdy_framer_use_new_methods3;
 
 namespace net {
 namespace test {
@@ -171,16 +171,16 @@ ostream& operator<<(ostream& os, HpackDecoderChoice v) {
   return os;
 }
 
-typedef std::
+typedef testing::
     tuple<QuicVersion, Perspective, Http2DecoderChoice, HpackDecoderChoice>
         TestParamsTuple;
 
 struct TestParams {
   explicit TestParams(TestParamsTuple params)
-      : version(std::get<0>(params)),
-        perspective(std::get<1>(params)),
-        http2_decoder(std::get<2>(params)),
-        hpack_decoder(std::get<3>(params)) {
+      : version(testing::get<0>(params)),
+        perspective(testing::get<1>(params)),
+        http2_decoder(testing::get<2>(params)),
+        hpack_decoder(testing::get<3>(params)) {
     switch (http2_decoder) {
       case HTTP2_DECODER_SPDY:
         FLAGS_use_nested_spdy_framer_decoder = false;
@@ -195,7 +195,7 @@ struct TestParams {
         FLAGS_use_http2_frame_decoder_adapter = true;
         // Http2FrameDecoderAdapter needs the new header methods, else
         // --use_http2_frame_decoder_adapter=true will be ignored.
-        FLAGS_spdy_framer_use_new_methods2 = true;
+        FLAGS_spdy_framer_use_new_methods3 = true;
         break;
     }
     switch (hpack_decoder) {
@@ -205,7 +205,7 @@ struct TestParams {
       case HPACK_DECODER_NEW:
         FLAGS_spdy_use_hpack_decoder2 = true;
         // Needs new header methods to be used.
-        FLAGS_spdy_framer_use_new_methods2 = true;
+        FLAGS_spdy_framer_use_new_methods3 = true;
         break;
     }
     FLAGS_quic_always_log_bugs_for_tests = true;
@@ -408,7 +408,7 @@ INSTANTIATE_TEST_CASE_P(
     Tests,
     QuicHeadersStreamTest,
     ::testing::Combine(
-        ::testing::ValuesIn(QuicSupportedVersions()),
+        ::testing::ValuesIn(AllSupportedVersions()),
         ::testing::Values(Perspective::IS_CLIENT, Perspective::IS_SERVER),
         ::testing::Values(HTTP2_DECODER_SPDY,
                           HTTP2_DECODER_NESTED_SPDY,