Merge internal change: 63891842 - QuicServerId changes

net/quic/crypto/quic_server_info.h

 // 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.
 
 #ifndef NET_QUIC_CRYPTO_QUIC_SERVER_INFO_H_
 #define NET_QUIC_CRYPTO_QUIC_SERVER_INFO_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_export.h"
-#include "net/quic/quic_session_key.h"
+#include "net/quic/quic_server_id.h"
 
 namespace net {
 
 class X509Certificate;
 
 // QuicServerInfo is an interface for fetching information about a QUIC server.
 // This information may be stored on disk so does not include keys or other
 // sensitive information. Primarily it's intended for caching the QUIC server's
 // crypto config.
 class NET_EXPORT_PRIVATE QuicServerInfo {
  public:
-  QuicServerInfo(const QuicSessionKey& server_key);
+  QuicServerInfo(const QuicServerId& server_id);
   virtual ~QuicServerInfo();
 
   // Start will commence the lookup. This must be called before any other
   // methods. By opportunistically calling this early, it may be possible to
   // overlap this object's lookup and reduce latency.
   virtual void Start() = 0;
 
   // WaitForDataReady returns OK if the fetch of the requested data has
   // completed. Otherwise it returns ERR_IO_PENDING and will call |callback| on
   // the current thread when ready.
@@ skipping 51 matching lines @@
   std::string Serialize();
   State state_;
 
  private:
   // ParseInner is a helper function for Parse.
   bool ParseInner(const std::string& data);
 
   // SerializeInner is a helper function for Serialize.
   std::string SerializeInner() const;
 
-  // This is the QUIC server (hostname, port, is_https) tuple for which we
-  // restore the crypto_config.
-  const QuicSessionKey server_key_;
+  // This is the QUIC server (hostname, port, is_https, privacy_mode) tuple for
+  // which we restore the crypto_config.
+  const QuicServerId server_id_;
 };
 
 class QuicServerInfoFactory {
  public:
   virtual ~QuicServerInfoFactory();
 
   // GetForServer returns a fresh, allocated QuicServerInfo for the given
-  // |server_key| or NULL on failure.
-  virtual QuicServerInfo* GetForServer(const QuicSessionKey& server_key) = 0;
+  // |server_id| or NULL on failure.
+  virtual QuicServerInfo* GetForServer(const QuicServerId& server_id) = 0;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CRYPTO_QUIC_SERVER_INFO_H_