Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Side by Side Diff: net/http/http_server_properties.h

Issue 1218813005: Revert of Pretty print AlternativeService in test macros. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | net/http/http_server_properties.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef NET_HTTP_HTTP_SERVER_PROPERTIES_H_ 5 #ifndef NET_HTTP_HTTP_SERVER_PROPERTIES_H_
6 #define NET_HTTP_HTTP_SERVER_PROPERTIES_H_ 6 #define NET_HTTP_HTTP_SERVER_PROPERTIES_H_
7 7
8 #include <iosfwd>
9 #include <map> 8 #include <map>
10 #include <string> 9 #include <string>
11
12 #include "base/basictypes.h" 10 #include "base/basictypes.h"
13 #include "base/containers/mru_cache.h" 11 #include "base/containers/mru_cache.h"
14 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
15 #include "base/time/time.h" 13 #include "base/time/time.h"
16 #include "net/base/host_port_pair.h" 14 #include "net/base/host_port_pair.h"
17 #include "net/base/net_export.h" 15 #include "net/base/net_export.h"
18 #include "net/base/net_util.h" 16 #include "net/base/net_util.h"
19 #include "net/quic/quic_bandwidth.h" 17 #include "net/quic/quic_bandwidth.h"
20 #include "net/socket/next_proto.h" 18 #include "net/socket/next_proto.h"
21 #include "net/spdy/spdy_framer.h" // TODO(willchan): Reconsider this. 19 #include "net/spdy/spdy_framer.h" // TODO(willchan): Reconsider this.
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 return port < other.port; 130 return port < other.port;
133 } 131 }
134 132
135 std::string ToString() const; 133 std::string ToString() const;
136 134
137 AlternateProtocol protocol; 135 AlternateProtocol protocol;
138 std::string host; 136 std::string host;
139 uint16 port; 137 uint16 port;
140 }; 138 };
141 139
142 NET_EXPORT std::ostream& operator<<(
143 std::ostream& os,
144 const AlternativeService& alternative_service);
145
146 struct NET_EXPORT AlternativeServiceInfo { 140 struct NET_EXPORT AlternativeServiceInfo {
147 AlternativeServiceInfo() : alternative_service(), probability(0.0) {} 141 AlternativeServiceInfo() : alternative_service(), probability(0.0) {}
148 142
149 AlternativeServiceInfo(const AlternativeService& alternative_service, 143 AlternativeServiceInfo(const AlternativeService& alternative_service,
150 double probability) 144 double probability)
151 : alternative_service(alternative_service), probability(probability) {} 145 : alternative_service(alternative_service), probability(probability) {}
152 146
153 AlternativeServiceInfo(AlternateProtocol protocol, 147 AlternativeServiceInfo(AlternateProtocol protocol,
154 const std::string& host, 148 const std::string& host,
155 uint16 port, 149 uint16 port,
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 330
337 virtual const ServerNetworkStatsMap& server_network_stats_map() const = 0; 331 virtual const ServerNetworkStatsMap& server_network_stats_map() const = 0;
338 332
339 private: 333 private:
340 DISALLOW_COPY_AND_ASSIGN(HttpServerProperties); 334 DISALLOW_COPY_AND_ASSIGN(HttpServerProperties);
341 }; 335 };
342 336
343 } // namespace net 337 } // namespace net
344 338
345 #endif // NET_HTTP_HTTP_SERVER_PROPERTIES_H_ 339 #endif // NET_HTTP_HTTP_SERVER_PROPERTIES_H_
OLDNEW
« no previous file with comments | « no previous file | net/http/http_server_properties.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698