Land Recent QUIC changes

net/quic/crypto/crypto_framer.h

Index: net/quic/crypto/crypto_framer.h
diff --git a/net/quic/crypto/crypto_framer.h b/net/quic/crypto/crypto_framer.h
index 786128453f70bb002ee0bc2020602520f8c19e29..75cc4059f207aeb5dcd1d7ae3a0f376eed0fa92b 100644
--- a/net/quic/crypto/crypto_framer.h
+++ b/net/quic/crypto/crypto_framer.h
@@ -56,9 +56,7 @@ class NET_EXPORT_PRIVATE CryptoFramer {
     visitor_ = visitor;
   }
 
-  QuicErrorCode error() const {
-    return error_;
-  }
+  QuicErrorCode error() const { return error_; }
 
   // Processes input data, which must be delivered in order.  Returns
   // false if there was an error, and true otherwise.
@@ -66,9 +64,7 @@ class NET_EXPORT_PRIVATE CryptoFramer {
 
   // Returns the number of bytes of buffered input data remaining to be
   // parsed.
-  size_t InputBytesRemaining() const {
-    return buffer_.length();
-  }
+  size_t InputBytesRemaining() const { return buffer_.length(); }
 
   // Returns a new QuicData owned by the caller that contains a serialized
   // |message|, or NULL if there was an error.
@@ -79,9 +75,7 @@ class NET_EXPORT_PRIVATE CryptoFramer {
   // Clears per-message state.  Does not clear the visitor.
   void Clear();
 
-  void set_error(QuicErrorCode error) {
-    error_ = error;
-  }
+  void set_error(QuicErrorCode error) { error_ = error; }
 
   // Represents the current state of the parsing state machine.
   enum CryptoFramerState {
@@ -105,7 +99,7 @@ class NET_EXPORT_PRIVATE CryptoFramer {
   uint16 num_entries_;
   // tags_and_lengths_ contains the tags that are currently being parsed and
   // their lengths.
-  std::vector<std::pair<CryptoTag, size_t> > tags_and_lengths_;
+  std::vector<std::pair<QuicTag, size_t> > tags_and_lengths_;
   // Cumulative length of all values in the message currently being parsed.
   size_t values_len_;
 };