OLD | NEW |
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/remote_test_server.h" | 5 #include "net/test/remote_test_server.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/json/json_writer.h" | 10 #include "base/json/json_writer.h" |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 | 56 |
57 RemoteTestServer::RemoteTestServer(Type type, | 57 RemoteTestServer::RemoteTestServer(Type type, |
58 const std::string& host, | 58 const std::string& host, |
59 const FilePath& document_root) | 59 const FilePath& document_root) |
60 : BaseTestServer(type, host), | 60 : BaseTestServer(type, host), |
61 spawner_server_port_(0) { | 61 spawner_server_port_(0) { |
62 if (!Init(document_root)) | 62 if (!Init(document_root)) |
63 NOTREACHED(); | 63 NOTREACHED(); |
64 } | 64 } |
65 | 65 |
66 RemoteTestServer::RemoteTestServer( | 66 RemoteTestServer::RemoteTestServer(Type type, |
67 const HTTPSOptions& https_options, | 67 const SSLOptions& ssl_options, |
68 const FilePath& document_root) | 68 const FilePath& document_root) |
69 : BaseTestServer(https_options), | 69 : BaseTestServer(type, ssl_options), |
70 spawner_server_port_(0) { | 70 spawner_server_port_(0) { |
71 if (!Init(document_root)) | 71 if (!Init(document_root)) |
72 NOTREACHED(); | 72 NOTREACHED(); |
73 } | 73 } |
74 | 74 |
75 RemoteTestServer::~RemoteTestServer() { | 75 RemoteTestServer::~RemoteTestServer() { |
76 Stop(); | 76 Stop(); |
77 } | 77 } |
78 | 78 |
79 bool RemoteTestServer::Start() { | 79 bool RemoteTestServer::Start() { |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
165 | 165 |
166 SetResourcePath(document_root, FilePath().AppendASCII("net") | 166 SetResourcePath(document_root, FilePath().AppendASCII("net") |
167 .AppendASCII("data") | 167 .AppendASCII("data") |
168 .AppendASCII("ssl") | 168 .AppendASCII("ssl") |
169 .AppendASCII("certificates")); | 169 .AppendASCII("certificates")); |
170 return true; | 170 return true; |
171 } | 171 } |
172 | 172 |
173 } // namespace net | 173 } // namespace net |
174 | 174 |
OLD | NEW |