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

Side by Side Diff: net/test/embedded_test_server/embedded_test_server.h

Issue 2341393002: Remove stl_util's STLDeleteContainerPairSecondPointers from net/. (Closed)
Patch Set: Created 4 years, 3 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
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_TEST_EMBEDDED_TEST_SERVER_EMBEDDED_TEST_SERVER_H_ 5 #ifndef NET_TEST_EMBEDDED_TEST_SERVER_EMBEDDED_TEST_SERVER_H_
6 #define NET_TEST_EMBEDDED_TEST_SERVER_EMBEDDED_TEST_SERVER_H_ 6 #define NET_TEST_EMBEDDED_TEST_SERVER_EMBEDDED_TEST_SERVER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 std::unique_ptr<base::Thread> io_thread_; 271 std::unique_ptr<base::Thread> io_thread_;
272 272
273 std::unique_ptr<TCPServerSocket> listen_socket_; 273 std::unique_ptr<TCPServerSocket> listen_socket_;
274 std::unique_ptr<StreamSocket> accepted_socket_; 274 std::unique_ptr<StreamSocket> accepted_socket_;
275 275
276 EmbeddedTestServerConnectionListener* connection_listener_; 276 EmbeddedTestServerConnectionListener* connection_listener_;
277 uint16_t port_; 277 uint16_t port_;
278 GURL base_url_; 278 GURL base_url_;
279 IPEndPoint local_endpoint_; 279 IPEndPoint local_endpoint_;
280 280
281 // Owns the HttpConnection objects. 281 std::map<StreamSocket*, std::unique_ptr<HttpConnection>> connections_;
282 std::map<StreamSocket*, HttpConnection*> connections_;
283 282
284 // Vector of registered and default request handlers and monitors. 283 // Vector of registered and default request handlers and monitors.
285 std::vector<HandleRequestCallback> request_handlers_; 284 std::vector<HandleRequestCallback> request_handlers_;
286 std::vector<MonitorRequestCallback> request_monitors_; 285 std::vector<MonitorRequestCallback> request_monitors_;
287 std::vector<HandleRequestCallback> default_request_handlers_; 286 std::vector<HandleRequestCallback> default_request_handlers_;
288 287
289 base::ThreadChecker thread_checker_; 288 base::ThreadChecker thread_checker_;
290 289
291 net::SSLServerConfig ssl_config_; 290 net::SSLServerConfig ssl_config_;
292 ServerCertificate cert_; 291 ServerCertificate cert_;
293 std::unique_ptr<SSLServerContext> context_; 292 std::unique_ptr<SSLServerContext> context_;
294 293
295 base::WeakPtrFactory<EmbeddedTestServer> weak_factory_; 294 base::WeakPtrFactory<EmbeddedTestServer> weak_factory_;
296 295
297 DISALLOW_COPY_AND_ASSIGN(EmbeddedTestServer); 296 DISALLOW_COPY_AND_ASSIGN(EmbeddedTestServer);
298 }; 297 };
299 298
300 } // namespace test_server 299 } // namespace test_server
301 300
302 // TODO(svaldez): Refactor EmbeddedTestServer to be in the net namespace. 301 // TODO(svaldez): Refactor EmbeddedTestServer to be in the net namespace.
303 using test_server::EmbeddedTestServer; 302 using test_server::EmbeddedTestServer;
304 303
305 } // namespace net 304 } // namespace net
306 305
307 #endif // NET_TEST_EMBEDDED_TEST_SERVER_EMBEDDED_TEST_SERVER_H_ 306 #endif // NET_TEST_EMBEDDED_TEST_SERVER_EMBEDDED_TEST_SERVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698