| Index: net/spdy/spdy_framer.cc
|
| diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc
|
| index 0ec0236aa0cd9f6d5487cd80e6186739cc04edb0..501f4a459359d3b865118492980e8b9e689d5801 100644
|
| --- a/net/spdy/spdy_framer.cc
|
| +++ b/net/spdy/spdy_framer.cc
|
| @@ -25,6 +25,7 @@
|
| #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"
|
| @@ -68,9 +69,18 @@ void UnpackStreamDependencyValues(uint32_t packed,
|
| 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;
|
| }
|
|
|
|
|