Change SupportsSpdy dict, SpdySettingsMap, ServerNetworkStatsMap, AlternativeServiceMap and disk da…

components/cronet/android/url_request_context_adapter.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/cronet/android/url_request_context_adapter.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <limits>
 #include <utility>
@@ skipping 178 matching lines @@
         continue;
       }
 
       if (quic_hint.alternate_port <= std::numeric_limits<uint16_t>::min() ||
           quic_hint.alternate_port > std::numeric_limits<uint16_t>::max()) {
         LOG(ERROR) << "Invalid QUIC hint alternate port: "
                    << quic_hint.alternate_port;
         continue;
       }
 
-      net::HostPortPair quic_hint_host_port_pair(canon_host,
-                                                 quic_hint.port);
+      url::SchemeHostPort quic_server("https", canon_host, quic_hint.port);

[mmenke, 2016/04/21 18:52:34]

include url/scheme_host_port.h

[Zhongyi Shi, 2016/04/21 19:44:29]

Done.

       net::AlternativeService alternative_service(
           net::AlternateProtocol::QUIC, "",
           static_cast<uint16_t>(quic_hint.alternate_port));
       context_->http_server_properties()->SetAlternativeService(
-          quic_hint_host_port_pair, alternative_service, base::Time::Max());
+          quic_server, alternative_service, base::Time::Max());
     }
   }
   load_disable_cache_ = config_->load_disable_cache;
   config_.reset(NULL);
 
   if (VLOG_IS_ON(2)) {
     net_log_observer_.reset(new NetLogObserver());
     context_->net_log()->DeprecatedAddObserver(
         net_log_observer_.get(),
         net::NetLogCaptureMode::IncludeCookiesAndCredentials());
@@ skipping 98 matching lines @@
     write_to_file_observer_.reset();
   }
 }
 
 void NetLogObserver::OnAddEntry(const net::NetLog::Entry& entry) {
   VLOG(2) << "Net log entry: type=" << entry.type()
           << ", source=" << entry.source().type << ", phase=" << entry.phase();
 }
 
 }  // namespace cronet