| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_ | 5 #ifndef NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_ |
| 6 #define NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_ | 6 #define NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> |
| 10 #include <string> | 11 #include <string> |
| 11 #include <utility> | 12 #include <utility> |
| 12 #include <vector> | 13 #include <vector> |
| 13 | 14 |
| 14 #include "base/compiler_specific.h" | 15 #include "base/compiler_specific.h" |
| 15 #include "base/files/file_path.h" | 16 #include "base/files/file_path.h" |
| 16 #include "base/macros.h" | 17 #include "base/macros.h" |
| 17 #include "base/memory/ref_counted.h" | 18 #include "base/memory/ref_counted.h" |
| 18 #include "base/memory/scoped_ptr.h" | |
| 19 #include "net/base/host_port_pair.h" | 19 #include "net/base/host_port_pair.h" |
| 20 #include "net/ssl/ssl_client_cert_type.h" | 20 #include "net/ssl/ssl_client_cert_type.h" |
| 21 | 21 |
| 22 class GURL; | 22 class GURL; |
| 23 | 23 |
| 24 namespace base { | 24 namespace base { |
| 25 class DictionaryValue; | 25 class DictionaryValue; |
| 26 } | 26 } |
| 27 | 27 |
| 28 namespace net { | 28 namespace net { |
| (...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 336 // Document root of the test server. | 336 // Document root of the test server. |
| 337 base::FilePath document_root_; | 337 base::FilePath document_root_; |
| 338 | 338 |
| 339 // Directory that contains the SSL certificates. | 339 // Directory that contains the SSL certificates. |
| 340 base::FilePath certificates_dir_; | 340 base::FilePath certificates_dir_; |
| 341 | 341 |
| 342 // Address the test server listens on. | 342 // Address the test server listens on. |
| 343 HostPortPair host_port_pair_; | 343 HostPortPair host_port_pair_; |
| 344 | 344 |
| 345 // Holds the data sent from the server (e.g., port number). | 345 // Holds the data sent from the server (e.g., port number). |
| 346 scoped_ptr<base::DictionaryValue> server_data_; | 346 std::unique_ptr<base::DictionaryValue> server_data_; |
| 347 | 347 |
| 348 // If |type_| is TYPE_HTTPS or TYPE_WSS, the TLS settings to use for the test | 348 // If |type_| is TYPE_HTTPS or TYPE_WSS, the TLS settings to use for the test |
| 349 // server. | 349 // server. |
| 350 SSLOptions ssl_options_; | 350 SSLOptions ssl_options_; |
| 351 | 351 |
| 352 Type type_; | 352 Type type_; |
| 353 | 353 |
| 354 // Has the server been started? | 354 // Has the server been started? |
| 355 bool started_; | 355 bool started_; |
| 356 | 356 |
| 357 // Enables logging of the server to the console. | 357 // Enables logging of the server to the console. |
| 358 bool log_to_console_; | 358 bool log_to_console_; |
| 359 | 359 |
| 360 // Is WebSocket basic HTTP authentication enabled? | 360 // Is WebSocket basic HTTP authentication enabled? |
| 361 bool ws_basic_auth_; | 361 bool ws_basic_auth_; |
| 362 | 362 |
| 363 // Disable creation of anonymous FTP user? | 363 // Disable creation of anonymous FTP user? |
| 364 bool no_anonymous_ftp_user_; | 364 bool no_anonymous_ftp_user_; |
| 365 | 365 |
| 366 scoped_ptr<ScopedPortException> allowed_port_; | 366 std::unique_ptr<ScopedPortException> allowed_port_; |
| 367 | 367 |
| 368 DISALLOW_COPY_AND_ASSIGN(BaseTestServer); | 368 DISALLOW_COPY_AND_ASSIGN(BaseTestServer); |
| 369 }; | 369 }; |
| 370 | 370 |
| 371 } // namespace net | 371 } // namespace net |
| 372 | 372 |
| 373 #endif // NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_ | 373 #endif // NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_ |
| OLD | NEW |