1 files changed, 19 insertions, 13 deletions

diff --git a/chromium/net/http/http_server_properties_manager.h b/chromium/net/http/http_server_properties_manager.h
index 73a3123658d..d80595179f3 100644
--- a/chromium/net/http/http_server_properties_manager.h
+++ b/chromium/net/http/http_server_properties_manager.h
@@ -42,8 +42,9 @@ class NET_EXPORT_PRIVATE HttpServerPropertiesManager {
   // |recently_broken_alternative_services|, which may be null.
   using OnPrefsLoadedCallback = base::OnceCallback<void(
       std::unique_ptr<HttpServerProperties::ServerInfoMap> server_info_map,
-      const IPAddress& last_quic_address,
-      std::unique_ptr<QuicServerInfoMap> quic_server_info_map,
+      const IPAddress& last_local_address_when_quic_worked,
+      std::unique_ptr<HttpServerProperties::QuicServerInfoMap>
+          quic_server_info_map,
       std::unique_ptr<BrokenAlternativeServiceList>
           broken_alternative_service_list,
       std::unique_ptr<RecentlyBrokenAlternativeServices>
@@ -81,8 +82,9 @@ class NET_EXPORT_PRIVATE HttpServerPropertiesManager {
   // simpler API.
   void ReadPrefs(
       std::unique_ptr<HttpServerProperties::ServerInfoMap>* server_info_map,
-      IPAddress* last_quic_address,
-      std::unique_ptr<QuicServerInfoMap>* quic_server_info_map,
+      IPAddress* last_local_address_when_quic_worked,
+      std::unique_ptr<HttpServerProperties::QuicServerInfoMap>*
+          quic_server_info_map,
       std::unique_ptr<BrokenAlternativeServiceList>*
           broken_alternative_service_list,
       std::unique_ptr<RecentlyBrokenAlternativeServices>*
@@ -106,8 +108,8 @@ class NET_EXPORT_PRIVATE HttpServerPropertiesManager {
   void WriteToPrefs(
       const HttpServerProperties::ServerInfoMap& server_info_map,
       const GetCannonicalSuffix& get_canonical_suffix,
-      const IPAddress& last_quic_address,
-      const QuicServerInfoMap& quic_server_info_map,
+      const IPAddress& last_local_address_when_quic_worked,
+      const HttpServerProperties::QuicServerInfoMap& quic_server_info_map,
       const BrokenAlternativeServiceList& broken_alternative_service_list,
       const RecentlyBrokenAlternativeServices&
           recently_broken_alternative_services,
@@ -157,29 +159,33 @@ class NET_EXPORT_PRIVATE HttpServerPropertiesManager {
       const base::DictionaryValue& server_dict,
       HttpServerProperties::ServerInfo* server_info);
 
-  void ReadSupportsQuic(const base::DictionaryValue& server_dict,
-                        IPAddress* last_quic_address);
+  void ReadLastLocalAddressWhenQuicWorked(
+      const base::DictionaryValue& server_dict,
+      IPAddress* last_local_address_when_quic_worked);
   void ParseNetworkStats(const url::SchemeHostPort& server,
                          const base::DictionaryValue& server_dict,
                          HttpServerProperties::ServerInfo* server_info);
-  void AddToQuicServerInfoMap(const base::DictionaryValue& server_dict,
-                              QuicServerInfoMap* quic_server_info_map);
+  void AddToQuicServerInfoMap(
+      const base::DictionaryValue& server_dict,
+      bool use_network_isolation_key,
+      HttpServerProperties::QuicServerInfoMap* quic_server_info_map);
   void AddToBrokenAlternativeServices(
       const base::DictionaryValue& broken_alt_svc_entry_dict,
+      bool use_network_isolation_key,
       BrokenAlternativeServiceList* broken_alternative_service_list,
       RecentlyBrokenAlternativeServices* recently_broken_alternative_services);
 
   void SaveAlternativeServiceToServerPrefs(
       const AlternativeServiceInfoVector& alternative_service_info_vector,
       base::DictionaryValue* server_pref_dict);
-  void SaveSupportsQuicToPrefs(
-      const IPAddress& last_quic_address,
+  void SaveLastLocalAddressWhenQuicWorkedToPrefs(
+      const IPAddress& last_local_address_when_quic_worked,
       base::DictionaryValue* http_server_properties_dict);
   void SaveNetworkStatsToServerPrefs(
       const ServerNetworkStats& server_network_stats,
       base::DictionaryValue* server_pref_dict);
   void SaveQuicServerInfoMapToServerPrefs(
-      const QuicServerInfoMap& quic_server_info_map,
+      const HttpServerProperties::QuicServerInfoMap& quic_server_info_map,
       base::DictionaryValue* http_server_properties_dict);
   void SaveBrokenAlternativeServicesToPrefs(
       const BrokenAlternativeServiceList& broken_alternative_service_list,