Land Recent QUIC Changes

net/quic/crypto/source_address_token.cc

Index: net/quic/crypto/source_address_token.cc
diff --git a/net/quic/crypto/source_address_token.cc b/net/quic/crypto/source_address_token.cc
index b095e762265f758aa2d2c9be40d5488fd8a255b5..f20c343f987e297e301cdd796529f72cb03368b8 100644
--- a/net/quic/crypto/source_address_token.cc
+++ b/net/quic/crypto/source_address_token.cc
@@ -14,6 +14,12 @@ using std::vector;
 
 namespace net {
 
+CachedNetworkParameters::CachedNetworkParameters() {
+}
+
+CachedNetworkParameters::~CachedNetworkParameters() {
+}
+
 SourceAddressToken::SourceAddressToken() {
 }
 
@@ -27,6 +33,8 @@ string SourceAddressToken::SerializeAsString() const {
   string time_str = base::Int64ToString(timestamp_);
   out.push_back(time_str.size());
   out.append(time_str);
+  // TODO(rtenneti): Implement serialization of optional CachedNetworkParameters
+  // when they are used.
   return out;
 }
 
@@ -52,6 +60,9 @@ bool SourceAddressToken::ParseFromArray(const char* plaintext,
 
   ip_.assign(&plaintext[1], ip_len);
   timestamp_ = timestamp;
+
+  // TODO(rtenneti): Implement parsing of optional CachedNetworkParameters when
+  // they are used.
   return true;
 }