Move a number of static variables SPDY to HttpNetworkSession::Params.

net/spdy/buffered_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/buffered_spdy_framer.h"
 
 #include "base/logging.h"
 
-namespace {
-
-bool g_enable_compression_default = true;
-
-}  // namespace
-
 namespace net {
 
-BufferedSpdyFramer::BufferedSpdyFramer(int version)
+BufferedSpdyFramer::BufferedSpdyFramer(int version, bool enable_compression)
     : spdy_framer_(version),
       visitor_(NULL),
       header_buffer_used_(0),
       header_buffer_valid_(false),
       header_stream_id_(SpdyFramer::kInvalidStream),
       frames_received_(0) {
-  spdy_framer_.set_enable_compression(g_enable_compression_default);
+  //DCHECK(!enable_compression);

[willchan no longer on Chromium, 2012/12/01 20:49:13]

?

[Ryan Hamilton, 2012/12/01 23:02:25]

Removed.  (Sorry, left over from debugging)

+  spdy_framer_.set_enable_compression(enable_compression);
   memset(header_buffer_, 0, sizeof(header_buffer_));
 }
 
 BufferedSpdyFramer::~BufferedSpdyFramer() {
 }
 
 void BufferedSpdyFramer::set_visitor(
     BufferedSpdyFramerVisitorInterface* visitor) {
   visitor_ = visitor;
   spdy_framer_.set_visitor(this);
@@ skipping 254 matching lines @@
 }
 
 SpdyPriority BufferedSpdyFramer::GetHighestPriority() const {
   return spdy_framer_.GetHighestPriority();
 }
 
 bool BufferedSpdyFramer::IsCompressible(const SpdyFrame& frame) const {
   return spdy_framer_.IsCompressible(frame);
 }
 
-// static
-void BufferedSpdyFramer::set_enable_compression_default(bool value) {
-  g_enable_compression_default = value;
-}
-
 void BufferedSpdyFramer::InitHeaderStreaming(SpdyStreamId stream_id) {
   memset(header_buffer_, 0, kHeaderBufferSize);
   header_buffer_used_ = 0;
   header_buffer_valid_ = true;
   header_stream_id_ = stream_id;
   DCHECK_NE(header_stream_id_, SpdyFramer::kInvalidStream);
 }
 
 }  // namespace net