Land Recent QUIC changes.

net/quic/quic_spdy_compressor.cc

 // Copyright (c) 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/quic_spdy_compressor.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 
 using std::string;
 
 namespace net {
 
 QuicSpdyCompressor::QuicSpdyCompressor()
-    : spdy_framer_(3),
+    : spdy_framer_(kSpdyVersion3),
       header_sequence_id_(1) {
   spdy_framer_.set_enable_compression(true);
 }
 
 QuicSpdyCompressor::~QuicSpdyCompressor() {
 }
 
 string QuicSpdyCompressor::CompressHeaders(
     const SpdyHeaderBlock& headers) {
   // TODO(rch): Modify the SpdyFramer to expose a
@@ skipping 15 matching lines @@
   string compressed;
   compressed.reserve(arraysize(id_str) + arraysize(len_str) + serialized_len);
   compressed.append(id_str, arraysize(id_str));
   compressed.append(len_str, arraysize(len_str));
   compressed.append(serialized);
   ++header_sequence_id_;
   return compressed;
 }
 
 }  // namespace net