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

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

Issue 2333923004: Extracting NetLog inner classes into their own classes. (Closed)
Patch Set: Some nit fixes and better, impl-agnostic naming of net_log_parameters_callback_typedef.h -> net/log… Created 4 years, 2 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 #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/memory/ptr_util.h" 14 #include "base/memory/ptr_util.h"
15 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
16 #include "base/path_service.h" 16 #include "base/path_service.h"
17 #include "base/process/process_metrics.h" 17 #include "base/process/process_metrics.h"
18 #include "base/run_loop.h" 18 #include "base/run_loop.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/cert/pem_tokenizer.h" 26 #include "net/cert/pem_tokenizer.h"
27 #include "net/cert/test_root_certs.h" 27 #include "net/cert/test_root_certs.h"
28 #include "net/log/net_log_source.h"
28 #include "net/socket/ssl_server_socket.h" 29 #include "net/socket/ssl_server_socket.h"
29 #include "net/socket/stream_socket.h" 30 #include "net/socket/stream_socket.h"
30 #include "net/socket/tcp_server_socket.h" 31 #include "net/socket/tcp_server_socket.h"
31 #include "net/ssl/ssl_server_config.h" 32 #include "net/ssl/ssl_server_config.h"
32 #include "net/test/cert_test_util.h" 33 #include "net/test/cert_test_util.h"
33 #include "net/test/embedded_test_server/default_handlers.h" 34 #include "net/test/embedded_test_server/default_handlers.h"
34 #include "net/test/embedded_test_server/embedded_test_server_connection_listener .h" 35 #include "net/test/embedded_test_server/embedded_test_server_connection_listener .h"
35 #include "net/test/embedded_test_server/http_connection.h" 36 #include "net/test/embedded_test_server/http_connection.h"
36 #include "net/test/embedded_test_server/http_request.h" 37 #include "net/test/embedded_test_server/http_request.h"
37 #include "net/test/embedded_test_server/http_response.h" 38 #include "net/test/embedded_test_server/http_response.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 bool success = InitializeAndListen(); 85 bool success = InitializeAndListen();
85 if (!success) 86 if (!success)
86 return false; 87 return false;
87 StartAcceptingConnections(); 88 StartAcceptingConnections();
88 return true; 89 return true;
89 } 90 }
90 91
91 bool EmbeddedTestServer::InitializeAndListen() { 92 bool EmbeddedTestServer::InitializeAndListen() {
92 DCHECK(!Started()); 93 DCHECK(!Started());
93 94
94 listen_socket_.reset(new TCPServerSocket(nullptr, NetLog::Source())); 95 listen_socket_.reset(new TCPServerSocket(nullptr, NetLogSource()));
95 96
96 int result = listen_socket_->ListenWithAddressAndPort("127.0.0.1", 0, 10); 97 int result = listen_socket_->ListenWithAddressAndPort("127.0.0.1", 0, 10);
97 if (result) { 98 if (result) {
98 LOG(ERROR) << "Listen failed: " << ErrorToString(result); 99 LOG(ERROR) << "Listen failed: " << ErrorToString(result);
99 listen_socket_.reset(); 100 listen_socket_.reset();
100 return false; 101 return false;
101 } 102 }
102 103
103 result = listen_socket_->GetLocalAddress(&local_endpoint_); 104 result = listen_socket_->GetLocalAddress(&local_endpoint_);
104 if (result != OK) { 105 if (result != OK) {
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 run_loop.QuitClosure())) { 460 run_loop.QuitClosure())) {
460 return false; 461 return false;
461 } 462 }
462 run_loop.Run(); 463 run_loop.Run();
463 464
464 return true; 465 return true;
465 } 466 }
466 467
467 } // namespace test_server 468 } // namespace test_server
468 } // namespace net 469 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698