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. |
|
Joao da Silva
2012/02/01 10:09:05
Nit: update copyright year
| |
| 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 |
| 11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 311 LOG(WARNING) << "Cannot find pyproto dir for generated code. " | 311 LOG(WARNING) << "Cannot find pyproto dir for generated code. " |
| 312 << "Testserver features that rely on it will not work"; | 312 << "Testserver features that rely on it will not work"; |
| 313 return true; | 313 return true; |
| 314 } | 314 } |
| 315 | 315 |
| 316 AppendToPythonPath(pyproto_dir); | 316 AppendToPythonPath(pyproto_dir); |
| 317 AppendToPythonPath(pyproto_dir.AppendASCII("chrome") | 317 AppendToPythonPath(pyproto_dir.AppendASCII("chrome") |
| 318 .AppendASCII("browser") | 318 .AppendASCII("browser") |
| 319 .AppendASCII("sync") | 319 .AppendASCII("sync") |
| 320 .AppendASCII("protocol")); | 320 .AppendASCII("protocol")); |
| 321 AppendToPythonPath(pyproto_dir.AppendASCII("device_management_pb")); | 321 AppendToPythonPath(pyproto_dir.AppendASCII("chrome") |
| 322 .AppendASCII("browser") | |
| 323 .AppendASCII("policy") | |
| 324 .AppendASCII("proto")); | |
| 322 | 325 |
| 323 return true; | 326 return true; |
| 324 } | 327 } |
| 325 | 328 |
| 326 bool TestServer::ParseServerData(const std::string& server_data) { | 329 bool TestServer::ParseServerData(const std::string& server_data) { |
| 327 VLOG(1) << "Server data: " << server_data; | 330 VLOG(1) << "Server data: " << server_data; |
| 328 base::JSONReader json_reader; | 331 base::JSONReader json_reader; |
| 329 scoped_ptr<Value> value(json_reader.JsonToValue(server_data, true, false)); | 332 scoped_ptr<Value> value(json_reader.JsonToValue(server_data, true, false)); |
| 330 if (!value.get() || | 333 if (!value.get() || |
| 331 !value->IsType(Value::TYPE_DICTIONARY)) { | 334 !value->IsType(Value::TYPE_DICTIONARY)) { |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 413 command_line->AppendArg(kBulkCipherSwitch + "=3des"); | 416 command_line->AppendArg(kBulkCipherSwitch + "=3des"); |
| 414 | 417 |
| 415 if (https_options_.record_resume) | 418 if (https_options_.record_resume) |
| 416 command_line->AppendArg("--https-record-resume"); | 419 command_line->AppendArg("--https-record-resume"); |
| 417 } | 420 } |
| 418 | 421 |
| 419 return true; | 422 return true; |
| 420 } | 423 } |
| 421 | 424 |
| 422 } // namespace net | 425 } // namespace net |
| OLD | NEW |