Land Recent QUIC changes

net/quic/crypto/crypto_framer.h

 // 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.
 
 #ifndef NET_QUIC_CRYPTO_CRYPTO_FRAMER_H_
 #define NET_QUIC_CRYPTO_CRYPTO_FRAMER_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 38 matching lines @@
   static CryptoHandshakeMessage* ParseMessage(base::StringPiece in);
 
   // Set callbacks to be called from the framer.  A visitor must be set, or
   // else the framer will crash.  It is acceptable for the visitor to do
   // nothing.  If this is called multiple times, only the last visitor
   // will be used.  |visitor| will be owned by the framer.
   void set_visitor(CryptoFramerVisitorInterface* visitor) {
     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.
   bool ProcessInput(base::StringPiece input);
 
   // 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.
   static QuicData* ConstructHandshakeMessage(
       const CryptoHandshakeMessage& message);
 
  private:
   // 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 {
     STATE_READING_TAG,
     STATE_READING_NUM_ENTRIES,
     STATE_READING_TAGS_AND_LENGTHS,
     STATE_READING_VALUES
   };
 
   // Visitor to invoke when messages are parsed.
   CryptoFramerVisitorInterface* visitor_;
   // Last error.
   QuicErrorCode error_;
   // Remaining unparsed data.
   std::string buffer_;
   // Current state of the parsing.
   CryptoFramerState state_;
   // The message currently being parsed.
   CryptoHandshakeMessage message_;
   // Number of entires in the message currently being parsed.
   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_;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CRYPTO_CRYPTO_FRAMER_H_