1 files changed, 11 insertions, 14 deletions

diff --git a/chromium/net/quic/quic_server_id.h b/chromium/net/quic/quic_server_id.h
index 7236bfc88b8..97dbebbb49a 100644
--- a/chromium/net/quic/quic_server_id.h
+++ b/chromium/net/quic/quic_server_id.h
@@ -5,6 +5,8 @@
 #ifndef NET_QUIC_QUIC_SERVER_ID_H_
 #define NET_QUIC_QUIC_SERVER_ID_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "net/base/host_port_pair.h"
@@ -18,15 +20,10 @@ namespace net {
 class NET_EXPORT_PRIVATE QuicServerId {
  public:
   QuicServerId();
-  QuicServerId(const HostPortPair& host_port_pair,
-               bool is_https,
-               PrivacyMode privacy_mode);
-  QuicServerId(const std::string& host,
-               uint16 port,
-               bool is_https);
+  QuicServerId(const HostPortPair& host_port_pair, PrivacyMode privacy_mode);
+  QuicServerId(const std::string& host, uint16_t port);
   QuicServerId(const std::string& host,
-               uint16 port,
-               bool is_https,
+               uint16_t port,
                PrivacyMode privacy_mode);
   ~QuicServerId();
 
@@ -34,9 +31,12 @@ class NET_EXPORT_PRIVATE QuicServerId {
   bool operator<(const QuicServerId& other) const;
   bool operator==(const QuicServerId& other) const;
 
+  // Creates a QuicServerId from a string formatted in same manner as
+  // ToString().
+  static QuicServerId FromString(const std::string& str);
+
   // ToString() will convert the QuicServerId to "scheme:hostname:port" or
-  // "scheme:hostname:port/private". "scheme" would either be "http" or "https"
-  // based on |is_https|.
+  // "scheme:hostname:port/private". "scheme" will be "https".
   std::string ToString() const;
 
   // Used in Chromium, but not in the server.
@@ -44,15 +44,12 @@ class NET_EXPORT_PRIVATE QuicServerId {
 
   const std::string& host() const { return host_port_pair_.host(); }
 
-  uint16 port() const { return host_port_pair_.port(); }
-
-  bool is_https() const { return is_https_; }
+  uint16_t port() const { return host_port_pair_.port(); }
 
   PrivacyMode privacy_mode() const { return privacy_mode_; }
 
  private:
   HostPortPair host_port_pair_;
-  bool is_https_;
   PrivacyMode privacy_mode_;
 };