Land Recent QUIC Changes.

net/quic/crypto/source_address_token.h

 // 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.
 
 #ifndef NET_QUIC_CRYPTO_SOURCE_ADDRESS_TOKEN_H_
 #define NET_QUIC_CRYPTO_SOURCE_ADDRESS_TOKEN_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 10 matching lines @@
   // Describes the state of the connection during which the supplied network
   // parameters were calculated.
   enum PreviousConnectionState {
     SLOW_START = 0,
     CONGESTION_AVOIDANCE = 1,
   };
 
   CachedNetworkParameters();
   ~CachedNetworkParameters();
 
+  bool operator==(const CachedNetworkParameters& other) const;
+  bool operator!=(const CachedNetworkParameters& other) const;
+
   std::string serving_region() const {
     return serving_region_;
   }
   void set_serving_region(base::StringPiece serving_region) {
     serving_region_ = serving_region.as_string();
   }
 
   int32 bandwidth_estimate_bytes_per_second() const {
     return bandwidth_estimate_bytes_per_second_;
   }
@@ skipping 85 matching lines @@
   void set_timestamp(int64 timestamp) {
     timestamp_ = timestamp;
   }
 
   const CachedNetworkParameters& cached_network_parameters() const {
     return cached_network_parameters_;
   }
   void set_cached_network_parameters(
       const CachedNetworkParameters& cached_network_parameters) {
     cached_network_parameters_ = cached_network_parameters;
+    has_cached_network_parameters_ = true;
+  }
+  bool has_cached_network_parameters() const {
+    return has_cached_network_parameters_;
   }
 
  private:
   // ip_ contains either 4 (IPv4) or 16 (IPv6) bytes of IP address in network
   // byte order.
   std::string ip_;
   // timestamp_ contains a UNIX timestamp value of the time when the token was
   // created.
   int64 timestamp_;
 
   // The server can provide estimated network parameters to be used for
   // initial parameter selection in future connections.
   CachedNetworkParameters cached_network_parameters_;
+  // TODO(rtenneti): Delete |has_cached_network_parameters_| after we convert
+  // SourceAddressToken to protobuf.
+  bool has_cached_network_parameters_;
 
   DISALLOW_COPY_AND_ASSIGN(SourceAddressToken);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CRYPTO_SOURCE_ADDRESS_TOKEN_H_