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

net/http/http_response_info.cc

 // 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.
 
 #include "net/http/http_response_info.h"
 
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "base/time/time.h"
 #include "net/base/auth.h"
@@ skipping 420 matching lines @@
       return false;
     case CONNECTION_INFO_QUIC_UNKNOWN_VERSION:
     case CONNECTION_INFO_QUIC_32:
     case CONNECTION_INFO_QUIC_33:
     case CONNECTION_INFO_QUIC_34:
     case CONNECTION_INFO_QUIC_35:
     case CONNECTION_INFO_QUIC_36:
     case CONNECTION_INFO_QUIC_37:
     case CONNECTION_INFO_QUIC_38:
     case CONNECTION_INFO_QUIC_39:
+    case CONNECTION_INFO_QUIC_40:
       return true;
     case NUM_OF_CONNECTION_INFOS:
       NOTREACHED();
       return false;
   }
   NOTREACHED();
   return false;
 }
 
 // static
@@ skipping 28 matching lines @@
     case CONNECTION_INFO_QUIC_35:
       return "http/2+quic/35";
     case CONNECTION_INFO_QUIC_36:
       return "http/2+quic/36";
     case CONNECTION_INFO_QUIC_37:
       return "http/2+quic/37";
     case CONNECTION_INFO_QUIC_38:
       return "http/2+quic/38";
     case CONNECTION_INFO_QUIC_39:
       return "http/2+quic/39";
+    case CONNECTION_INFO_QUIC_40:
+      return "http/2+quic/40";
     case CONNECTION_INFO_HTTP0_9:
       return "http/0.9";
     case CONNECTION_INFO_HTTP1_0:
       return "http/1.0";
     case NUM_OF_CONNECTION_INFOS:
       break;
   }
   NOTREACHED();
   return "";
 }
 
 }  // namespace net