| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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_URL_REQUEST_URL_REQUEST_UNITTEST_H_ | 5 #ifndef NET_URL_REQUEST_URL_REQUEST_UNITTEST_H_ |
| 6 #define NET_URL_REQUEST_URL_REQUEST_UNITTEST_H_ | 6 #define NET_URL_REQUEST_URL_REQUEST_UNITTEST_H_ |
| 7 | 7 |
| 8 #include <sstream> | 8 #include <sstream> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 file_util::AppendToPath(&testserver_path, L"testserver.py"); | 272 file_util::AppendToPath(&testserver_path, L"testserver.py"); |
| 273 | 273 |
| 274 ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &python_runtime_)); | 274 ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &python_runtime_)); |
| 275 file_util::AppendToPath(&python_runtime_, L"third_party"); | 275 file_util::AppendToPath(&python_runtime_, L"third_party"); |
| 276 file_util::AppendToPath(&python_runtime_, L"python_24"); | 276 file_util::AppendToPath(&python_runtime_, L"python_24"); |
| 277 file_util::AppendToPath(&python_runtime_, L"python.exe"); | 277 file_util::AppendToPath(&python_runtime_, L"python.exe"); |
| 278 | 278 |
| 279 std::wstring test_data_directory; | 279 std::wstring test_data_directory; |
| 280 PathService::Get(base::DIR_SOURCE_ROOT, &test_data_directory); | 280 PathService::Get(base::DIR_SOURCE_ROOT, &test_data_directory); |
| 281 std::wstring normalized_document_root = document_root; | 281 std::wstring normalized_document_root = document_root; |
| 282 #if defined(OS_WIN) |
| 282 std::replace(normalized_document_root.begin(), | 283 std::replace(normalized_document_root.begin(), |
| 283 normalized_document_root.end(), | 284 normalized_document_root.end(), |
| 284 L'/', file_util::kPathSeparator); | 285 L'/', FilePath::kSeparators[0]); |
| 286 #endif |
| 285 file_util::AppendToPath(&test_data_directory, normalized_document_root); | 287 file_util::AppendToPath(&test_data_directory, normalized_document_root); |
| 286 | 288 |
| 287 #if defined(OS_WIN) | 289 #if defined(OS_WIN) |
| 288 std::wstring command_line = | 290 std::wstring command_line = |
| 289 L"\"" + python_runtime_ + L"\" " + L"\"" + testserver_path + | 291 L"\"" + python_runtime_ + L"\" " + L"\"" + testserver_path + |
| 290 L"\" --port=" + UTF8ToWide(port_str) + L" --data-dir=\"" + | 292 L"\" --port=" + UTF8ToWide(port_str) + L" --data-dir=\"" + |
| 291 test_data_directory + L"\""; | 293 test_data_directory + L"\""; |
| 292 if (!cert_path.empty()) { | 294 if (!cert_path.empty()) { |
| 293 command_line.append(L" --https=\""); | 295 command_line.append(L" --https=\""); |
| 294 command_line.append(cert_path); | 296 command_line.append(cert_path); |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 407 const std::wstring& document_root, | 409 const std::wstring& document_root, |
| 408 const std::wstring& cert_path) : TestServer(ManualInit()) { | 410 const std::wstring& cert_path) : TestServer(ManualInit()) { |
| 409 Init(host_name, port, document_root, cert_path); | 411 Init(host_name, port, document_root, cert_path); |
| 410 } | 412 } |
| 411 | 413 |
| 412 virtual std::string scheme() { return std::string("https"); } | 414 virtual std::string scheme() { return std::string("https"); } |
| 413 }; | 415 }; |
| 414 | 416 |
| 415 #endif // NET_URL_REQUEST_URL_REQUEST_UNITTEST_H_ | 417 #endif // NET_URL_REQUEST_URL_REQUEST_UNITTEST_H_ |
| 416 | 418 |
| OLD | NEW |