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

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

Issue 2102973004: Do not load alternative service from disk for non-https servers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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_manager.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 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 #ifndef NET_HTTP_HTTP_SERVER_PROPERTIES_MANAGER_H_ 5 #ifndef NET_HTTP_HTTP_SERVER_PROPERTIES_MANAGER_H_
6 #define NET_HTTP_HTTP_SERVER_PROPERTIES_MANAGER_H_ 6 #define NET_HTTP_HTTP_SERVER_PROPERTIES_MANAGER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 ServerNetworkStatsMap* server_network_stats_map, 239 ServerNetworkStatsMap* server_network_stats_map,
240 QuicServerInfoMap* quic_server_info_map, 240 QuicServerInfoMap* quic_server_info_map,
241 const base::Closure& completion); 241 const base::Closure& completion);
242 242
243 private: 243 private:
244 typedef std::vector<std::string> ServerList; 244 typedef std::vector<std::string> ServerList;
245 245
246 FRIEND_TEST_ALL_PREFIXES(HttpServerPropertiesManagerTest, 246 FRIEND_TEST_ALL_PREFIXES(HttpServerPropertiesManagerTest,
247 AddToAlternativeServiceMap); 247 AddToAlternativeServiceMap);
248 FRIEND_TEST_ALL_PREFIXES(HttpServerPropertiesManagerTest, 248 FRIEND_TEST_ALL_PREFIXES(HttpServerPropertiesManagerTest,
249 DoNotLoadAltSvcForInsecureOrigins);
250 FRIEND_TEST_ALL_PREFIXES(HttpServerPropertiesManagerTest,
249 DoNotLoadExpiredAlternativeService); 251 DoNotLoadExpiredAlternativeService);
250 void OnHttpServerPropertiesChanged(); 252 void OnHttpServerPropertiesChanged();
251 253
252 bool AddServersData(const base::DictionaryValue& server_dict, 254 bool AddServersData(const base::DictionaryValue& server_dict,
253 ServerList* spdy_servers, 255 ServerList* spdy_servers,
254 SpdySettingsMap* spdy_settings_map, 256 SpdySettingsMap* spdy_settings_map,
255 AlternativeServiceMap* alternative_service_map, 257 AlternativeServiceMap* alternative_service_map,
256 ServerNetworkStatsMap* network_stats_map, 258 ServerNetworkStatsMap* network_stats_map,
257 int version); 259 int version);
258 void AddToSpdySettingsMap(const url::SchemeHostPort& server, 260 void AddToSpdySettingsMap(const url::SchemeHostPort& server,
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 // Used to get |weak_ptr_| to self on the network thread. 323 // Used to get |weak_ptr_| to self on the network thread.
322 std::unique_ptr<base::WeakPtrFactory<HttpServerPropertiesManager>> 324 std::unique_ptr<base::WeakPtrFactory<HttpServerPropertiesManager>>
323 network_weak_ptr_factory_; 325 network_weak_ptr_factory_;
324 326
325 DISALLOW_COPY_AND_ASSIGN(HttpServerPropertiesManager); 327 DISALLOW_COPY_AND_ASSIGN(HttpServerPropertiesManager);
326 }; 328 };
327 329
328 } // namespace net 330 } // namespace net
329 331
330 #endif // NET_HTTP_HTTP_SERVER_PROPERTIES_MANAGER_H_ 332 #endif // NET_HTTP_HTTP_SERVER_PROPERTIES_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | net/http/http_server_properties_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698