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

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

Issue 2090463002: Move net/base/test_data_directory.[cc,h] to net/test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | « net/ssl/openssl_client_key_store_unittest.cc ('k') | net/test/test_data_directory.h » ('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 #include "net/test/embedded_test_server/embedded_test_server.h" 5 #include "net/test/embedded_test_server/embedded_test_server.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/files/file_util.h" 11 #include "base/files/file_util.h"
12 #include "base/location.h" 12 #include "base/location.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/message_loop/message_loop.h" 14 #include "base/message_loop/message_loop.h"
15 #include "base/path_service.h" 15 #include "base/path_service.h"
16 #include "base/process/process_metrics.h" 16 #include "base/process/process_metrics.h"
17 #include "base/run_loop.h" 17 #include "base/run_loop.h"
18 #include "base/stl_util.h" 18 #include "base/stl_util.h"
19 #include "base/strings/string_util.h" 19 #include "base/strings/string_util.h"
20 #include "base/strings/stringprintf.h" 20 #include "base/strings/stringprintf.h"
21 #include "base/threading/thread_restrictions.h" 21 #include "base/threading/thread_restrictions.h"
22 #include "base/threading/thread_task_runner_handle.h" 22 #include "base/threading/thread_task_runner_handle.h"
23 #include "crypto/rsa_private_key.h" 23 #include "crypto/rsa_private_key.h"
24 #include "net/base/ip_endpoint.h" 24 #include "net/base/ip_endpoint.h"
25 #include "net/base/net_errors.h" 25 #include "net/base/net_errors.h"
26 #include "net/base/test_data_directory.h"
27 #include "net/cert/pem_tokenizer.h" 26 #include "net/cert/pem_tokenizer.h"
28 #include "net/cert/test_root_certs.h" 27 #include "net/cert/test_root_certs.h"
29 #include "net/socket/ssl_server_socket.h" 28 #include "net/socket/ssl_server_socket.h"
30 #include "net/socket/stream_socket.h" 29 #include "net/socket/stream_socket.h"
31 #include "net/socket/tcp_server_socket.h" 30 #include "net/socket/tcp_server_socket.h"
32 #include "net/ssl/ssl_server_config.h" 31 #include "net/ssl/ssl_server_config.h"
33 #include "net/test/cert_test_util.h" 32 #include "net/test/cert_test_util.h"
34 #include "net/test/embedded_test_server/default_handlers.h" 33 #include "net/test/embedded_test_server/default_handlers.h"
35 #include "net/test/embedded_test_server/embedded_test_server_connection_listener .h" 34 #include "net/test/embedded_test_server/embedded_test_server_connection_listener .h"
36 #include "net/test/embedded_test_server/http_connection.h" 35 #include "net/test/embedded_test_server/http_connection.h"
37 #include "net/test/embedded_test_server/http_request.h" 36 #include "net/test/embedded_test_server/http_request.h"
38 #include "net/test/embedded_test_server/http_response.h" 37 #include "net/test/embedded_test_server/http_response.h"
39 #include "net/test/embedded_test_server/request_handler_util.h" 38 #include "net/test/embedded_test_server/request_handler_util.h"
39 #include "net/test/test_data_directory.h"
40 40
41 namespace net { 41 namespace net {
42 namespace test_server { 42 namespace test_server {
43 43
44 EmbeddedTestServer::EmbeddedTestServer() : EmbeddedTestServer(TYPE_HTTP) {} 44 EmbeddedTestServer::EmbeddedTestServer() : EmbeddedTestServer(TYPE_HTTP) {}
45 45
46 EmbeddedTestServer::EmbeddedTestServer(Type type) 46 EmbeddedTestServer::EmbeddedTestServer(Type type)
47 : is_using_ssl_(type == TYPE_HTTPS), 47 : is_using_ssl_(type == TYPE_HTTPS),
48 connection_listener_(nullptr), 48 connection_listener_(nullptr),
49 port_(0), 49 port_(0),
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 run_loop.QuitClosure())) { 452 run_loop.QuitClosure())) {
453 return false; 453 return false;
454 } 454 }
455 run_loop.Run(); 455 run_loop.Run();
456 456
457 return true; 457 return true;
458 } 458 }
459 459
460 } // namespace test_server 460 } // namespace test_server
461 } // namespace net 461 } // namespace net
OLDNEW
« no previous file with comments | « net/ssl/openssl_client_key_store_unittest.cc ('k') | net/test/test_data_directory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698