Merge internal change: 63891842 - QuicServerId changes

net/http/disk_cache_based_quic_server_info.h

Index: net/http/disk_cache_based_quic_server_info.h
diff --git a/net/http/disk_cache_based_quic_server_info.h b/net/http/disk_cache_based_quic_server_info.h
index 3c384ccb8ec7a78922e8a539e1faa273b8b42208..2a18ef5abc8df7375f95835959cf8cc5b3a93339 100644
--- a/net/http/disk_cache_based_quic_server_info.h
+++ b/net/http/disk_cache_based_quic_server_info.h
@@ -18,7 +18,7 @@ namespace net {
 
 class HttpCache;
 class IOBuffer;
-class QuicSessionKey;
+class QuicServerId;
 
 // DiskCacheBasedQuicServerInfo fetches information about a QUIC server from
 // our standard disk cache. Since the information is defined to be
@@ -27,7 +27,7 @@ class NET_EXPORT_PRIVATE DiskCacheBasedQuicServerInfo
     : public QuicServerInfo,
       public NON_EXPORTED_BASE(base::NonThreadSafe) {
  public:
-  DiskCacheBasedQuicServerInfo(const QuicSessionKey& server_key,
+  DiskCacheBasedQuicServerInfo(const QuicServerId& server_id,
                                HttpCache* http_cache);
 
   // QuicServerInfo implementation.
@@ -91,7 +91,7 @@ class NET_EXPORT_PRIVATE DiskCacheBasedQuicServerInfo
   bool ready_;
   bool found_entry_;  // Controls the behavior of DoCreateOrOpen.
   std::string new_data_;
-  const QuicSessionKey server_key_;
+  const QuicServerId server_id_;
   HttpCache* const http_cache_;
   disk_cache::Backend* backend_;
   disk_cache::Entry* entry_;