diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/net/quic/quic_server_id.h | |
parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/net/quic/quic_server_id.h')
-rw-r--r-- | chromium/net/quic/quic_server_id.h | 25 |
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_; }; |