| 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/base_paths.h" | |
| 10 #include "base/file_path.h" | 9 #include "base/file_path.h" |
| 11 #include "base/file_util.h" | 10 #include "base/file_util.h" |
| 12 #include "base/json/json_writer.h" | 11 #include "base/json/json_writer.h" |
| 13 #include "base/logging.h" | 12 #include "base/logging.h" |
| 14 #include "base/path_service.h" | 13 #include "base/path_service.h" |
| 15 #include "base/string_number_conversions.h" | 14 #include "base/string_number_conversions.h" |
| 16 #include "base/string_split.h" | 15 #include "base/string_split.h" |
| 17 #include "base/values.h" | 16 #include "base/values.h" |
| 18 #include "googleurl/src/gurl.h" | 17 #include "googleurl/src/gurl.h" |
| 19 #include "net/base/host_port_pair.h" | 18 #include "net/base/host_port_pair.h" |
| 20 #include "net/base/net_errors.h" | 19 #include "net/base/net_errors.h" |
| 21 #include "net/test/spawner_communicator.h" | 20 #include "net/test/spawner_communicator.h" |
| 22 | 21 |
| 22 #if defined(OS_ANDROID) |
| 23 #include "base/base_paths_android.h" |
| 24 #endif |
| 25 |
| 23 namespace net { | 26 namespace net { |
| 24 | 27 |
| 25 namespace { | 28 namespace { |
| 26 | 29 |
| 27 // To reduce the running time of tests, tests may be sharded across several | 30 // To reduce the running time of tests, tests may be sharded across several |
| 28 // devices. This means that it may be necessary to support multiple instances | 31 // devices. This means that it may be necessary to support multiple instances |
| 29 // of the test server spawner and the Python test server simultaneously on the | 32 // of the test server spawner and the Python test server simultaneously on the |
| 30 // same host. Each pair of (test server spawner, Python test server) correspond | 33 // same host. Each pair of (test server spawner, Python test server) correspond |
| 31 // to a single testing device. | 34 // to a single testing device. |
| 32 // The mapping between the test server spawner and the individual Python test | 35 // The mapping between the test server spawner and the individual Python test |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 | 178 |
| 176 SetResourcePath(document_root, FilePath().AppendASCII("net") | 179 SetResourcePath(document_root, FilePath().AppendASCII("net") |
| 177 .AppendASCII("data") | 180 .AppendASCII("data") |
| 178 .AppendASCII("ssl") | 181 .AppendASCII("ssl") |
| 179 .AppendASCII("certificates")); | 182 .AppendASCII("certificates")); |
| 180 return true; | 183 return true; |
| 181 } | 184 } |
| 182 | 185 |
| 183 } // namespace net | 186 } // namespace net |
| 184 | 187 |
| OLD | NEW |