Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/test_server.h" | 5 #include "net/test/test_server.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 342 TestRootCerts* root_certs = TestRootCerts::GetInstance(); | 342 TestRootCerts* root_certs = TestRootCerts::GetInstance(); |
| 343 return root_certs->AddFromFile(GetRootCertificatePath()); | 343 return root_certs->AddFromFile(GetRootCertificatePath()); |
| 344 } | 344 } |
| 345 | 345 |
| 346 bool TestServer::AddCommandLineArguments(CommandLine* command_line) const { | 346 bool TestServer::AddCommandLineArguments(CommandLine* command_line) const { |
| 347 command_line->AppendArg("--port=" + | 347 command_line->AppendArg("--port=" + |
| 348 base::IntToString(host_port_pair_.port())); | 348 base::IntToString(host_port_pair_.port())); |
| 349 command_line->AppendArgNative(FILE_PATH_LITERAL("--data-dir=") + | 349 command_line->AppendArgNative(FILE_PATH_LITERAL("--data-dir=") + |
| 350 document_root_.value()); | 350 document_root_.value()); |
| 351 | 351 |
| 352 if (logging::GetMinLogLevel() == logging::LOG_VERBOSE) { | 352 if (VLOG_IS_ON(1)) { |
|
Nicolas Zea
2011/06/07 19:55:24
Do we want this to also happen for higher verbosit
akalin
2011/06/07 20:17:38
I think so. VLOG_IS_ON(n) for n > 1 also implies
| |
| 353 command_line->AppendArg("--log-to-console"); | 353 command_line->AppendArg("--log-to-console"); |
| 354 } | 354 } |
| 355 | 355 |
| 356 if (type_ == TYPE_FTP) { | 356 if (type_ == TYPE_FTP) { |
| 357 command_line->AppendArg("-f"); | 357 command_line->AppendArg("-f"); |
| 358 } else if (type_ == TYPE_SYNC) { | 358 } else if (type_ == TYPE_SYNC) { |
| 359 command_line->AppendArg("--sync"); | 359 command_line->AppendArg("--sync"); |
| 360 } else if (type_ == TYPE_HTTPS) { | 360 } else if (type_ == TYPE_HTTPS) { |
| 361 FilePath certificate_path(certificates_dir_); | 361 FilePath certificate_path(certificates_dir_); |
| 362 certificate_path = certificate_path.Append( | 362 certificate_path = certificate_path.Append( |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 393 if (https_options_.bulk_ciphers & HTTPSOptions::BULK_CIPHER_AES256) | 393 if (https_options_.bulk_ciphers & HTTPSOptions::BULK_CIPHER_AES256) |
| 394 command_line->AppendArg(kBulkCipherSwitch + "=aes256"); | 394 command_line->AppendArg(kBulkCipherSwitch + "=aes256"); |
| 395 if (https_options_.bulk_ciphers & HTTPSOptions::BULK_CIPHER_3DES) | 395 if (https_options_.bulk_ciphers & HTTPSOptions::BULK_CIPHER_3DES) |
| 396 command_line->AppendArg(kBulkCipherSwitch + "=3des"); | 396 command_line->AppendArg(kBulkCipherSwitch + "=3des"); |
| 397 } | 397 } |
| 398 | 398 |
| 399 return true; | 399 return true; |
| 400 } | 400 } |
| 401 | 401 |
| 402 } // namespace net | 402 } // namespace net |
| OLD | NEW |