| 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 } | 75 } |
| 76 | 76 |
| 77 bool RemoteTestServer::Start() { | 77 bool RemoteTestServer::Start() { |
| 78 if (!spawner_communicator_.get()) | 78 if (!spawner_communicator_.get()) |
| 79 return false; | 79 return false; |
| 80 | 80 |
| 81 base::DictionaryValue arguments_dict; | 81 base::DictionaryValue arguments_dict; |
| 82 if (!GenerateArguments(&arguments_dict)) | 82 if (!GenerateArguments(&arguments_dict)) |
| 83 return false; | 83 return false; |
| 84 | 84 |
| 85 if (arguments_dict.HasKey("ocsp")) { | |
| 86 NOTIMPLEMENTED() << "OCSP on-demand generation is not supported. " | |
| 87 << "See http://crbug.com/119642."; | |
| 88 return false; | |
| 89 } | |
| 90 | |
| 91 // Append the 'server-type' argument which is used by spawner server to | 85 // Append the 'server-type' argument which is used by spawner server to |
| 92 // pass right server type to Python test server. | 86 // pass right server type to Python test server. |
| 93 arguments_dict.SetString("server-type", GetServerTypeString(type())); | 87 arguments_dict.SetString("server-type", GetServerTypeString(type())); |
| 94 | 88 |
| 95 // Generate JSON-formatted argument string. | 89 // Generate JSON-formatted argument string. |
| 96 std::string arguments_string; | 90 std::string arguments_string; |
| 97 base::JSONWriter::Write(&arguments_dict, &arguments_string); | 91 base::JSONWriter::Write(&arguments_dict, &arguments_string); |
| 98 if (arguments_string.empty()) | 92 if (arguments_string.empty()) |
| 99 return false; | 93 return false; |
| 100 | 94 |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 | 159 |
| 166 SetResourcePath(document_root, FilePath().AppendASCII("net") | 160 SetResourcePath(document_root, FilePath().AppendASCII("net") |
| 167 .AppendASCII("data") | 161 .AppendASCII("data") |
| 168 .AppendASCII("ssl") | 162 .AppendASCII("ssl") |
| 169 .AppendASCII("certificates")); | 163 .AppendASCII("certificates")); |
| 170 return true; | 164 return true; |
| 171 } | 165 } |
| 172 | 166 |
| 173 } // namespace net | 167 } // namespace net |
| 174 | 168 |
| OLD | NEW |