| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/quic/core/quic_server_id.h" | 5 #include "net/quic/core/quic_server_id.h" |
| 6 | 6 |
| 7 #include <tuple> | 7 #include <tuple> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "net/base/host_port_pair.h" | 10 #include "net/base/host_port_pair.h" |
| 11 #include "net/base/port_util.h" | 11 #include "net/base/port_util.h" |
| 12 #include "net/quic/platform/api/quic_str_cat.h" |
| 12 #include "url/gurl.h" | 13 #include "url/gurl.h" |
| 13 | 14 |
| 14 using std::string; | 15 using std::string; |
| 15 | 16 |
| 16 namespace net { | 17 namespace net { |
| 17 | 18 |
| 18 QuicServerId::QuicServerId() : privacy_mode_(PRIVACY_MODE_DISABLED) {} | 19 QuicServerId::QuicServerId() : privacy_mode_(PRIVACY_MODE_DISABLED) {} |
| 19 | 20 |
| 20 QuicServerId::QuicServerId(const HostPortPair& host_port_pair, | 21 QuicServerId::QuicServerId(const HostPortPair& host_port_pair, |
| 21 PrivacyMode privacy_mode) | 22 PrivacyMode privacy_mode) |
| (...skipping 23 matching lines...) Expand all Loading... |
| 45 QuicServerId QuicServerId::FromString(const std::string& str) { | 46 QuicServerId QuicServerId::FromString(const std::string& str) { |
| 46 GURL url(str); | 47 GURL url(str); |
| 47 if (!url.is_valid()) | 48 if (!url.is_valid()) |
| 48 return QuicServerId(); | 49 return QuicServerId(); |
| 49 return QuicServerId(HostPortPair::FromURL(url), url.path_piece() == "/private" | 50 return QuicServerId(HostPortPair::FromURL(url), url.path_piece() == "/private" |
| 50 ? PRIVACY_MODE_ENABLED | 51 ? PRIVACY_MODE_ENABLED |
| 51 : PRIVACY_MODE_DISABLED); | 52 : PRIVACY_MODE_DISABLED); |
| 52 } | 53 } |
| 53 | 54 |
| 54 string QuicServerId::ToString() const { | 55 string QuicServerId::ToString() const { |
| 55 return "https://" + host_port_pair_.ToString() + | 56 return QuicStrCat("https://", host_port_pair_.ToString(), |
| 56 (privacy_mode_ == PRIVACY_MODE_ENABLED ? "/private" : ""); | 57 (privacy_mode_ == PRIVACY_MODE_ENABLED ? "/private" : "")); |
| 57 } | 58 } |
| 58 | 59 |
| 59 } // namespace net | 60 } // namespace net |
| OLD | NEW |