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

net/quic/core/quic_headers_stream_test.cc

 // Copyright 2013 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/core/quic_headers_stream.h"
 
 #include <string>
 
 #include "base/strings/string_number_conversions.h"
 #include "net/quic/core/quic_bug_tracker.h"
@@ skipping 22 matching lines @@
 using testing::InSequence;
 using testing::Invoke;
 using testing::Return;
 using testing::StrictMock;
 using testing::WithArgs;
 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 {
 
 class MockHpackDebugVisitor : public QuicHeadersStream::HpackDebugVisitor {
  public:
   explicit MockHpackDebugVisitor() : HpackDebugVisitor() {}
 
   MOCK_METHOD1(OnUseEntry, void(QuicTime::Delta elapsed));
 
@@ skipping 110 matching lines @@
 ostream& operator<<(ostream& os, HpackDecoderChoice v) {
   switch (v) {
     case HPACK_DECODER_SPDY:
       return os << "SPDY";
     case HPACK_DECODER_NEW:
       return os << "NEW";
   }
   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;
         FLAGS_use_http2_frame_decoder_adapter = false;
         break;
       case HTTP2_DECODER_NESTED_SPDY:
         FLAGS_use_nested_spdy_framer_decoder = true;
         FLAGS_use_http2_frame_decoder_adapter = false;
         break;
       case HTTP2_DECODER_NEW:
         FLAGS_use_nested_spdy_framer_decoder = false;
         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) {
       case HPACK_DECODER_SPDY:
         FLAGS_spdy_use_hpack_decoder2 = false;
         break;
       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;
     VLOG(1) << "TestParams: version: " << QuicVersionToString(version)
             << ", perspective: " << perspective
             << ", http2_decoder: " << http2_decoder
             << ", hpack_decoder: " << hpack_decoder;
   }
 
   QuicVersion version;
@@ skipping 182 matching lines @@
   QuicStreamFrame stream_frame_;
   QuicStreamId next_promised_stream_id_;
 };
 
 // Run all tests with each version, perspective (client or server),
 // HTTP/2 and HPACK decoder.
 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,
                           HTTP2_DECODER_NEW),
         ::testing::Values(HPACK_DECODER_SPDY, HPACK_DECODER_NEW)));
 
 TEST_P(QuicHeadersStreamTest, StreamId) {
   EXPECT_EQ(3u, headers_stream_->id());
 }
 
@@ skipping 542 matching lines @@
       }
       saved_data_.clear();
       saved_payloads_.clear();
     }
   }
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net