Landing Recent QUIC changes until Mon May 8 21:42:46 2017 +0000

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 109 matching lines @@
       return "SPDY";
     case net::HttpResponseInfo::CONNECTION_INFO_QUIC_UNKNOWN_VERSION:
     case net::HttpResponseInfo::CONNECTION_INFO_QUIC_32:
     case net::HttpResponseInfo::CONNECTION_INFO_QUIC_33:
     case net::HttpResponseInfo::CONNECTION_INFO_QUIC_34:
     case net::HttpResponseInfo::CONNECTION_INFO_QUIC_35:
     case net::HttpResponseInfo::CONNECTION_INFO_QUIC_36:
     case net::HttpResponseInfo::CONNECTION_INFO_QUIC_37:
     case net::HttpResponseInfo::CONNECTION_INFO_QUIC_38:
     case net::HttpResponseInfo::CONNECTION_INFO_QUIC_39:
+    case net::HttpResponseInfo::CONNECTION_INFO_QUIC_40:
       return "QUIC";
     case net::HttpResponseInfo::NUM_OF_CONNECTION_INFOS:
       NOTREACHED();
       return "";
   }
   NOTREACHED();
   return "";
 }
 
 int GetNetErrorFromURLRequestStatus(const net::URLRequestStatus& status) {
@@ skipping 97 matching lines @@
 ActualTime::~ActualTime() {}
 
 base::Time ActualTime::Now() { return base::Time::Now(); }
 base::TimeTicks ActualTime::NowTicks() { return base::TimeTicks::Now(); }
 
 std::unique_ptr<MockableTime::Timer> ActualTime::CreateTimer() {
   return std::unique_ptr<MockableTime::Timer>(new ActualTimer());
 }
 
 }  // namespace domain_reliability