Refactor SSLClientSocket::SerializeNextProtos().

net/socket/ssl_client_socket.h

Index: net/socket/ssl_client_socket.h
diff --git a/net/socket/ssl_client_socket.h b/net/socket/ssl_client_socket.h
index 67800602ee4c3ec24f4989c20b067ff36a9c7d7b..595bc4338116c01c64a67aec5a1a5efe97e6ba60 100644
--- a/net/socket/ssl_client_socket.h
+++ b/net/socket/ssl_client_socket.h
@@ -178,14 +178,16 @@ class NET_EXPORT SSLClientSocket : public SSLSocket {
   // inadequate TLS version.
   static bool IsTLSVersionAdequateForHTTP2(const SSLConfig& ssl_config);
 
-  // Serializes |next_protos| in the wire format for ALPN: protocols are listed
-  // in order, each prefixed by a one-byte length.  Any HTTP/2 protocols in
-  // |next_protos| are ignored if |can_advertise_http2| is false.
+  // Remove HTTP/2 from |next_protos|.
+  static void DisableHTTP2(NextProtoVector* next_protos);

[davidben, 2015/09/28 22:16:22]

Do you think this should perhaps be in next_proto.h? It's purely a random
operation on NextProtoVector.

(Whereas SerializeNextProtos is serializing it in an SSL-specific encoding.)

[Bence, 2015/09/28 23:55:52]

Great idea!  Especially because I might end up using it elsewhere too, like
HttpNetworkTransaction or similar, and from that angle it really does not belong
to SSLClientSocket.  At the same time, the unit test does not seem to belong
anywhere, so I'm scratching it.

Done.

+
+  // Serialize |next_protos| in the wire format for ALPN and NPN: protocols are
+  // listed in order, each prefixed by a one-byte length.
   static std::vector<uint8_t> SerializeNextProtos(
-      const NextProtoVector& next_protos,
-      bool can_advertise_http2);
+      const NextProtoVector& next_protos);
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(SSLClientSocket, DisableHTTP2);
   FRIEND_TEST_ALL_PREFIXES(SSLClientSocket, SerializeNextProtos);
   // For signed_cert_timestamps_received_ and stapled_ocsp_response_received_.
   FRIEND_TEST_ALL_PREFIXES(SSLClientSocketTest,