Remove one layer of abstraction from HTTP/2 frame representations.

net/spdy/core/spdy_framer_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/spdy/core/spdy_framer.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include <algorithm>
@@ skipping 378 matching lines @@
         error_count_(0),
         headers_frame_count_(0),
         push_promise_frame_count_(0),
         goaway_count_(0),
         setting_count_(0),
         settings_ack_sent_(0),
         settings_ack_received_(0),
         continuation_count_(0),
         altsvc_count_(0),
         priority_count_(0),
-        test_altsvc_ir_(0),
         on_unknown_frame_result_(false),
         last_window_update_stream_(0),
         last_window_update_delta_(0),
         last_push_promise_stream_(0),
         last_push_promise_promised_stream_(0),
         data_bytes_(0),
         fin_frame_count_(0),
         fin_flag_count_(0),
         end_of_stream_count_(0),
         control_frame_header_data_count_(0),
@@ skipping 134 matching lines @@
     VLOG(1) << "OnContinuation(" << stream_id << ", " << end << ")";
     ++continuation_count_;
   }
 
   void OnAltSvc(SpdyStreamId stream_id,
                 SpdyStringPiece origin,
                 const SpdyAltSvcWireFormat::AlternativeServiceVector&
                     altsvc_vector) override {
     VLOG(1) << "OnAltSvc(" << stream_id << ", \"" << origin
             << "\", altsvc_vector)";
-    test_altsvc_ir_.set_stream_id(stream_id);
+    test_altsvc_ir_ = SpdyMakeUnique<SpdyAltSvcIR>(stream_id);
     if (origin.length() > 0) {
-      test_altsvc_ir_.set_origin(SpdyString(origin));
+      test_altsvc_ir_->set_origin(SpdyString(origin));
     }
     for (const auto& altsvc : altsvc_vector) {
-      test_altsvc_ir_.add_altsvc(altsvc);
+      test_altsvc_ir_->add_altsvc(altsvc);
     }
     ++altsvc_count_;
   }
 
   void OnPriority(SpdyStreamId stream_id,
                   SpdyStreamId parent_stream_id,
                   int weight,
                   bool exclusive) override {
     VLOG(1) << "OnPriority(" << stream_id << ", " << parent_stream_id << ", "
             << weight << ", " << (exclusive ? 1 : 0) << ")";
@@ skipping 87 matching lines @@
   int error_count_;
   int headers_frame_count_;
   int push_promise_frame_count_;
   int goaway_count_;
   int setting_count_;
   int settings_ack_sent_;
   int settings_ack_received_;
   int continuation_count_;
   int altsvc_count_;
   int priority_count_;
-  SpdyAltSvcIR test_altsvc_ir_;
+  std::unique_ptr<SpdyAltSvcIR> test_altsvc_ir_;
   bool on_unknown_frame_result_;
   SpdyStreamId last_window_update_stream_;
   int last_window_update_delta_;
   SpdyStreamId last_push_promise_stream_;
   SpdyStreamId last_push_promise_promised_stream_;
   int data_bytes_;
   int fin_frame_count_;      // The count of RST_STREAM type frames received.
   int fin_flag_count_;       // The count of frames with the FIN flag set.
   int end_of_stream_count_;  // The count of zero-length data frames.
   int control_frame_header_data_count_;  // The count of chunks received.
@@ skipping 3808 matching lines @@
   while (unframed_data > 0) {
     size_t to_read = std::min(kReadChunkSize, unframed_data);
     visitor.SimulateInFramer(
         reinterpret_cast<unsigned char*>(control_frame.data() + framed_data),
         to_read);
     unframed_data -= to_read;
     framed_data += to_read;
   }
   EXPECT_EQ(0, visitor.error_count_);
   EXPECT_EQ(1, visitor.altsvc_count_);
-  ASSERT_EQ(2u, visitor.test_altsvc_ir_.altsvc_vector().size());
-  EXPECT_TRUE(visitor.test_altsvc_ir_.altsvc_vector()[0] == altsvc1);
-  EXPECT_TRUE(visitor.test_altsvc_ir_.altsvc_vector()[1] == altsvc2);
+  ASSERT_NE(nullptr, visitor.test_altsvc_ir_);
+  ASSERT_EQ(2u, visitor.test_altsvc_ir_->altsvc_vector().size());
+  EXPECT_TRUE(visitor.test_altsvc_ir_->altsvc_vector()[0] == altsvc1);
+  EXPECT_TRUE(visitor.test_altsvc_ir_->altsvc_vector()[1] == altsvc2);
 }
 
 // While RFC7838 Section 4 says that an ALTSVC frame on stream 0 with empty
 // origin MUST be ignored, it is not implemented at the framer level: instead,
 // such frames are passed on to the consumer.
 TEST_P(SpdyFramerTest, ReadAltSvcFrame) {
   constexpr struct {
     uint32_t stream_id;
     const char* origin;
   } test_cases[] = {{0, ""},
@@ skipping 303 matching lines @@
 
     EXPECT_EQ(1, visitor->data_frame_count_);
     EXPECT_EQ(strlen(four_score), static_cast<unsigned>(visitor->data_bytes_));
     EXPECT_EQ(0, visitor->headers_frame_count_);
   }
 }
 
 }  // namespace test
 
 }  // namespace net