Re-enable use of QUIC for Cobalt

net/http/http_network_session.cc

@@ -385,6 +385,10 @@ void HttpNetworkSession::DisableQuic() {
 void HttpNetworkSession::SetEnableQuic(bool enable_quic) {
   params_.enable_quic = enable_quic;
 }
+
+bool HttpNetworkSession::UseQuicForUnknownOrigin() const {
+  return params_.use_quic_for_unknown_origins;
+}
 #endif  // defined(STARBOARD)
 
 void HttpNetworkSession::ClearSSLSessionCache() {

net/http/http_network_session.h

@@ -158,7 +158,7 @@ struct NET_EXPORT HttpNetworkSessionParams {
 #if defined(STARBOARD)
     // If true, request to an origin without recorded alt-svc info will
     // try to establish both QUIC and TCP connections and use the faster one.
-    bool use_quic_for_unknown_origins;
+  bool use_quic_for_unknown_origins = false;
 #endif
 
   // If non-empty, QUIC will only be spoken to hosts in this list.
@@ -315,6 +315,9 @@ class NET_EXPORT HttpNetworkSession {
 
 #if defined(STARBOARD)
   void SetEnableQuic(bool enable_quic);
+
+  // Whether to try QUIC connection for origins without alt-svc on record.
+  bool UseQuicForUnknownOrigin() const;
 #endif  // defined(STARBOARD)
 
   // Clear the SSL session cache.

net/http/http_stream_factory_job_controller.cc

@@ -43,6 +43,10 @@ namespace net {
 
 namespace {
 
+#if defined(STARBOARD)
+const int kDefaultQUICServerPort = 443;
+#endif
+
 // Returns parameters associated with the proxy resolution.
 base::Value::Dict NetLogHttpStreamJobProxyServerResolved(
     const ProxyServer& proxy_server) {
@@ -1198,8 +1202,27 @@ HttpStreamFactory::JobController::GetAlternativeServiceInfoInternal(
       http_server_properties.GetAlternativeServiceInfos(
           url::SchemeHostPort(original_url),
           request_info.network_anonymization_key);
+#if defined(STARBOARD)
+  // This block of code suggests QUIC connection for initial requests to a
+  // new host. This method is proven to provide performance benefit while still
+  // enabling Cobalt network module to fall back on TCP connection when QUIC
+  // fails or is too slow.
+  if (alternative_service_info_vector.empty() && session_->IsQuicEnabled() &&
+      session_->UseQuicForUnknownOrigin()) {
+    url::SchemeHostPort origin(original_url);
+    if (origin.port() == kDefaultQUICServerPort) {
+      quic::ParsedQuicVersionVector versions = quic::AllSupportedVersions();
+      return AlternativeServiceInfo::CreateQuicAlternativeServiceInfo(
+          AlternativeService(net::kProtoQUIC, origin.host(),
+                             kDefaultQUICServerPort),
+          base::Time::Max(), versions);
+    }
+    return AlternativeServiceInfo();
+  }
+#else
   if (alternative_service_info_vector.empty())
     return AlternativeServiceInfo();
+#endif
 
   bool quic_advertised = false;
   bool quic_all_broken = true;

net/third_party/quiche/src/quiche/quic/core/quic_connection.cc

@@ -343,9 +343,15 @@ QuicConnection::QuicConnection(
   QUICHE_DCHECK(perspective_ == Perspective::IS_CLIENT ||
                 default_path_.self_address.IsInitialized());
 
+#if defined(STARBOARD)
+  LOG(INFO) << "Created QUIC connection for address: "
+            << peer_address().ToString()
+            << " with version: " << ParsedQuicVersionToString(version());
+#else
   QUIC_DLOG(INFO) << ENDPOINT << "Created connection with server connection ID "
                   << server_connection_id
                   << " and version: " << ParsedQuicVersionToString(version());
+#endif
 
   QUIC_BUG_IF(quic_bug_12714_2, !QuicUtils::IsConnectionIdValidForVersion(
                                     server_connection_id, transport_version()))