Landing Recent QUIC changes until 01/31/2016 05:22 UTC

components/domain_reliability/util.cc

 // Copyright 2014 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 "components/domain_reliability/util.h"
 
 #include <stddef.h>
 
 #include "base/callback.h"
 #include "base/logging.h"
@@ skipping 127 matching lines @@
   // Invalid protocol version.
   { net::QUIC_INVALID_VERSION, "quic.invalid_version" },
 
   // The Header ID for a stream was too far from the previous.
   { net::QUIC_INVALID_HEADER_ID, "quic.invalid_header_id" },
   // Negotiable parameter received during handshake had invalid value.
   { net::QUIC_INVALID_NEGOTIATED_VALUE, "quic.invalid_negotiated_value" },
   // There was an error decompressing data.
   { net::QUIC_DECOMPRESSION_FAILURE, "quic.decompression_failure" },
   // We hit our prenegotiated (or default) timeout
-  { net::QUIC_CONNECTION_TIMED_OUT, "quic.connection.timed_out" },
+  { net::QUIC_NETWORK_IDLE_TIMEOUT, "quic.connection.idle_time_out" },
   // We hit our overall connection timeout
-  { net::QUIC_CONNECTION_OVERALL_TIMED_OUT,
-   "quic.connection.overall_timed_out" },
+  { net::QUIC_HANDSHAKE_TIMEOUT,
+   "quic.connection.handshake_timed_out" },
   // There was an error encountered migrating addresses
   { net::QUIC_ERROR_MIGRATING_ADDRESS, "quic.error_migrating_address" },
   // There was an error while writing to the socket.
   { net::QUIC_PACKET_WRITE_ERROR, "quic.packet.write_error" },
   // There was an error while reading from the socket.
   { net::QUIC_PACKET_READ_ERROR, "quic.packet.read_error" },
   // We received a STREAM_FRAME with no data and no fin flag set.
   { net::QUIC_INVALID_STREAM_FRAME, "quic.invalid_stream_frame" },
   // We received invalid data on the headers stream.
   { net::QUIC_INVALID_HEADERS_STREAM_DATA, "quic.invalid_headers_stream_data" },
@@ skipping 298 matching lines @@
 ActualTime::~ActualTime() {}
 
 base::Time ActualTime::Now() { return base::Time::Now(); }
 base::TimeTicks ActualTime::NowTicks() { return base::TimeTicks::Now(); }
 
 scoped_ptr<MockableTime::Timer> ActualTime::CreateTimer() {
   return scoped_ptr<MockableTime::Timer>(new ActualTimer());
 }
 
 }  // namespace domain_reliability