Change the QUIC nextHopProtocol to "http/2+quic/<version>" from "hq".

As per recent discussions in the QUIC IETF Working Group,
the latter is reserved for implementations of the final RFC.

https://github.com/w3c/navigation-timing/issues/71

Change-Id: I743eb5fcca87b1191e046fd531d19a2ee6ce8bef
Reviewed-on: https://chromium-review.googlesource.com/963492Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Yoav Weiss <yoav@yoav.ws>
Commit-Queue: Ryan Hamilton <rch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543493}

third_party/WebKit/Source/core/timing/PerformanceResourceTiming.cpp

@@ -133,10 +133,6 @@ AtomicString PerformanceResourceTiming::GetNextHopProtocol(
   // If connection_info is also unknown, return empty string.
   // (https://github.com/w3c/navigation-timing/issues/71)
   returnedProtocol = (returnedProtocol == "unknown") ? "" : returnedProtocol;
-  // If the protocol is http over quic (e.g. http/2+quic/37), convert it to the
-  // alpn id "hq". (https://github.com/w3c/navigation-timing/issues/71)
-  if (returnedProtocol.Contains("quic"))
-    returnedProtocol = "hq";
 
   return returnedProtocol;
 }

third_party/WebKit/Source/core/timing/PerformanceResourceTimingTest.cpp

@@ -32,11 +32,11 @@ TEST_F(PerformanceResourceTimingTest,
   EXPECT_EQ(GetNextHopProtocol(alpn_negotiated_protocol, connection_info), "");
 }
 
-TEST_F(PerformanceResourceTimingTest, TestFallbackToHQWhenContainsQuic) {
+TEST_F(PerformanceResourceTimingTest, TestNoChangeWhenContainsQuic) {
   AtomicString connection_info = "http/1.1";
-  AtomicString alpn_negotiated_protocol = "quic/1spdy/3";
+  AtomicString alpn_negotiated_protocol = "http/2+quic/39";
   EXPECT_EQ(GetNextHopProtocol(alpn_negotiated_protocol, connection_info),
-            "hq");
+            alpn_negotiated_protocol);
 }
 
 TEST_F(PerformanceResourceTimingTest, TestNoChangeWhenOtherwise) {