Landing Recent QUIC changes until 9:58 AM, Sep 17, 2016 UTC

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 512 matching lines @@
     stream_frame_.data_buffer = frame.data();
     stream_frame_.data_length = frame.size();
     headers_stream_->OnStreamFrame(stream_frame_);
     if (perspective() == Perspective::IS_CLIENT) {
       stream_frame_.offset += frame.size();
       CheckHeaders();
     }
   }
 }
 
+TEST_P(QuicHeadersStreamTest, ProcessPushPromiseDisabledSetting) {
+  FLAGS_quic_respect_http2_settings_frame = true;
+  FLAGS_quic_enable_server_push_by_default = true;
+  session_.OnConfigNegotiated();
+  SpdySettingsIR data;
+  // Respect supported settings frames SETTINGS_ENABLE_PUSH.
+  data.AddSetting(SETTINGS_ENABLE_PUSH, true, true, 0);
+  SpdySerializedFrame frame(framer_->SerializeFrame(data));
+  stream_frame_.data_buffer = frame.data();
+  stream_frame_.data_length = frame.size();
+  if (perspective() == Perspective::IS_CLIENT) {
+    EXPECT_CALL(
+        *connection_,
+        CloseConnection(QUIC_INVALID_HEADERS_STREAM_DATA,
+                        "Unsupported field of HTTP/2 SETTINGS frame: 9", _));
+  }
+  headers_stream_->OnStreamFrame(stream_frame_);
+  EXPECT_EQ(
+      session_.server_push_enabled(),
+      (perspective() == Perspective::IS_CLIENT && version() > QUIC_VERSION_34));
+}
+
 TEST_P(QuicHeadersStreamTest, EmptyHeaderHOLBlockedTime) {
   EXPECT_CALL(session_, OnHeadersHeadOfLineBlocking(_)).Times(0);
   testing::InSequence seq;
   bool fin = true;
   for (int stream_num = 0; stream_num < 10; stream_num++) {
     QuicStreamId stream_id = QuicClientDataStreamId(stream_num);
     // Replace with "WriteHeadersAndSaveData"
     SpdySerializedFrame frame;
     if (perspective() == Perspective::IS_SERVER) {
       SpdyHeadersIR headers_frame(stream_id, headers_.Clone());
@@ skipping 214 matching lines @@
       CloseConnection(QUIC_INVALID_HEADERS_STREAM_DATA,
                       "Unsupported field of HTTP/2 SETTINGS frame: " +
                           base::IntToString(SETTINGS_MAX_CONCURRENT_STREAMS),
                       _));
   EXPECT_CALL(
       *connection_,
       CloseConnection(QUIC_INVALID_HEADERS_STREAM_DATA,
                       "Unsupported field of HTTP/2 SETTINGS frame: " +
                           base::IntToString(SETTINGS_INITIAL_WINDOW_SIZE),
                       _));
+  if (!FLAGS_quic_enable_server_push_by_default ||
+      session_.perspective() == Perspective::IS_CLIENT) {
+    EXPECT_CALL(*connection_,
+                CloseConnection(QUIC_INVALID_HEADERS_STREAM_DATA,
+                                "Unsupported field of HTTP/2 SETTINGS frame: " +
+                                    base::IntToString(SETTINGS_ENABLE_PUSH),
+                                _));
+  }
   EXPECT_CALL(*connection_,
               CloseConnection(QUIC_INVALID_HEADERS_STREAM_DATA,
                               "Unsupported field of HTTP/2 SETTINGS frame: " +
-                                  base::IntToString(SETTINGS_ENABLE_PUSH),
-                              _));
-  EXPECT_CALL(*connection_,
-              CloseConnection(QUIC_INVALID_HEADERS_STREAM_DATA,
-                              "Unsupported field of HTTP/2 SETTINGS frame: " +
                                   base::IntToString(SETTINGS_MAX_FRAME_SIZE),
                               _));
   stream_frame_.data_buffer = frame.data();
   stream_frame_.data_length = frame.size();
   headers_stream_->OnStreamFrame(stream_frame_);
 }
 
 TEST_P(QuicHeadersStreamTest, ProcessSpdyPingFrame) {
   SpdyPingIR data(1);
   SpdySerializedFrame frame(framer_->SerializeFrame(data));
@@ skipping 178 matching lines @@
       }
       saved_data_.clear();
       saved_payloads_.clear();
     }
   }
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net