Add Http2FrameDecoderAdapter.

net/spdy/spdy_framer.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/spdy_framer.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <cctype>
 #include <ios>
 #include <iterator>
 #include <list>
 #include <memory>
 #include <new>
 #include <string>
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
 #include "net/quic/core/quic_flags.h"
 #include "net/spdy/hpack/hpack_constants.h"
 #include "net/spdy/hpack/hpack_decoder.h"
 #include "net/spdy/hpack/hpack_decoder2.h"
+#include "net/spdy/http2_frame_decoder_adapter.h"
 #include "net/spdy/spdy_bitmasks.h"
 #include "net/spdy/spdy_bug_tracker.h"
 #include "net/spdy/spdy_flags.h"
 #include "net/spdy/spdy_frame_builder.h"
 #include "net/spdy/spdy_frame_reader.h"
 #include "net/spdy/spdy_framer_decoder_adapter.h"
 #include "net/spdy/spdy_headers_block_parser.h"
 
 using base::StringPiece;
 using std::hex;
@@ skipping 23 matching lines @@
   *exclusive = (packed >> 31) != 0;
   // Zero out the highest-order bit to get the parent stream id.
   *parent_stream_id = packed & 0x7fffffff;
 }
 
 // Creates a SpdyFramerDecoderAdapter if flags indicate that one should be
 // used. This code is isolated to hopefully make merging into Chromium easier.
 std::unique_ptr<SpdyFramerDecoderAdapter> DecoderAdapterFactory(
     SpdyFramer* outer) {
   if (FLAGS_use_nested_spdy_framer_decoder) {
+    if (FLAGS_use_http2_frame_decoder_adapter) {
+      SPDY_BUG << "Two SpdyFramerDecoderAdapter are enabled!";
+    }
     DVLOG(1) << "Creating NestedSpdyFramerDecoder.";
     return CreateNestedSpdyFramerDecoder(outer);
   }
+
+  if (FLAGS_use_http2_frame_decoder_adapter) {
+    DVLOG(1) << "Creating Http2FrameDecoderAdapter.";
+    return CreateHttp2FrameDecoderAdapter(outer);
+  }
+
   return nullptr;
 }
 
 // Used to indicate no flags in a HTTP2 flags field.
 const uint8_t kNoFlags = 0;
 
 // Wire sizes of priority payloads.
 const size_t kPriorityDependencyPayloadSize = 4;
 const size_t kPriorityWeightPayloadSize = 1;
 
@@ skipping 2344 matching lines @@
   builder->WriteUInt32(header_block.size());
 
   // Serialize each header.
   for (const auto& header : header_block) {
     builder->WriteStringPiece32(base::ToLowerASCII(header.first));
     builder->WriteStringPiece32(header.second);
   }
 }
 
 }  // namespace net