Index: net/http/http_server_properties.h |
diff --git a/net/http/http_server_properties.h b/net/http/http_server_properties.h |
index fc19d24e18b103a384f34507ddf30a277dd5582c..847123fd27ec321effef7f22c34c12355af07a0f 100644 |
--- a/net/http/http_server_properties.h |
+++ b/net/http/http_server_properties.h |
@@ -20,6 +20,7 @@ |
#include "net/base/net_export.h" |
#include "net/quic/core/quic_bandwidth.h" |
#include "net/quic/core/quic_server_id.h" |
+#include "net/quic/core/quic_versions.h" |
#include "net/socket/next_proto.h" |
#include "net/spdy/core/spdy_framer.h" // TODO(willchan): Reconsider this. |
#include "net/spdy/core/spdy_protocol.h" |
@@ -115,24 +116,20 @@ NET_EXPORT_PRIVATE std::ostream& operator<<( |
const AlternativeService& alternative_service); |
struct NET_EXPORT AlternativeServiceInfo { |
- AlternativeServiceInfo() : alternative_service() {} |
+ AlternativeServiceInfo(); |
+ ~AlternativeServiceInfo(); |
AlternativeServiceInfo(const AlternativeService& alternative_service, |
- base::Time expiration) |
- : alternative_service(alternative_service), |
- expiration(expiration) {} |
- |
- AlternativeServiceInfo(NextProto protocol, |
- const std::string& host, |
- uint16_t port, |
- base::Time expiration) |
- : alternative_service(protocol, host, port), expiration(expiration) {} |
+ base::Time expiration); |
AlternativeServiceInfo( |
- const AlternativeServiceInfo& alternative_service_info) = default; |
+ const AlternativeServiceInfo& alternative_service_info); |
+ |
AlternativeServiceInfo& operator=( |
- const AlternativeServiceInfo& alternative_service_info) = default; |
+ const AlternativeServiceInfo& alternative_service_info); |
+ // TODO(zhongyi): add equality check on |advertised_versions| once it |
+ // is persisted to disk. |
Ryan Hamilton
2017/05/25 22:01:45
I'm not sure I understand why we can't do this now
Zhongyi Shi
2017/06/06 22:04:52
Done.
Ah, we definitely can do this together. I wa
|
bool operator==(const AlternativeServiceInfo& other) const { |
return alternative_service == other.alternative_service && |
expiration == other.expiration; |
@@ -146,6 +143,7 @@ struct NET_EXPORT AlternativeServiceInfo { |
AlternativeService alternative_service; |
base::Time expiration; |
+ QuicVersionVector advertised_versions; |
}; |
struct NET_EXPORT SupportsQuic { |