| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "chrome/test/chromedriver/server/http_handler.h" | 5 #include "chrome/test/chromedriver/server/http_handler.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
| 10 #include "base/json/json_writer.h" | 10 #include "base/json/json_writer.h" |
| (...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 702 } | 702 } |
| 703 if (!value) | 703 if (!value) |
| 704 value.reset(base::Value::CreateNullValue()); | 704 value.reset(base::Value::CreateNullValue()); |
| 705 | 705 |
| 706 base::DictionaryValue body_params; | 706 base::DictionaryValue body_params; |
| 707 body_params.SetInteger("status", status.code()); | 707 body_params.SetInteger("status", status.code()); |
| 708 body_params.Set("value", value.release()); | 708 body_params.Set("value", value.release()); |
| 709 body_params.SetString("sessionId", session_id); | 709 body_params.SetString("sessionId", session_id); |
| 710 std::string body; | 710 std::string body; |
| 711 base::JSONWriter::WriteWithOptions( | 711 base::JSONWriter::WriteWithOptions( |
| 712 &body_params, base::JSONWriter::OPTIONS_OMIT_DOUBLE_TYPE_PRESERVATION, | 712 body_params, base::JSONWriter::OPTIONS_OMIT_DOUBLE_TYPE_PRESERVATION, |
| 713 &body); | 713 &body); |
| 714 scoped_ptr<net::HttpServerResponseInfo> response( | 714 scoped_ptr<net::HttpServerResponseInfo> response( |
| 715 new net::HttpServerResponseInfo(net::HTTP_OK)); | 715 new net::HttpServerResponseInfo(net::HTTP_OK)); |
| 716 response->SetBody(body, "application/json; charset=utf-8"); | 716 response->SetBody(body, "application/json; charset=utf-8"); |
| 717 return response.Pass(); | 717 return response.Pass(); |
| 718 } | 718 } |
| 719 | 719 |
| 720 namespace internal { | 720 namespace internal { |
| 721 | 721 |
| 722 const char kNewSessionPathPattern[] = "session"; | 722 const char kNewSessionPathPattern[] = "session"; |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 762 params.SetString(name, path_parts[i]); | 762 params.SetString(name, path_parts[i]); |
| 763 } else if (command_path_parts[i] != path_parts[i]) { | 763 } else if (command_path_parts[i] != path_parts[i]) { |
| 764 return false; | 764 return false; |
| 765 } | 765 } |
| 766 } | 766 } |
| 767 out_params->MergeDictionary(¶ms); | 767 out_params->MergeDictionary(¶ms); |
| 768 return true; | 768 return true; |
| 769 } | 769 } |
| 770 | 770 |
| 771 } // namespace internal | 771 } // namespace internal |
| OLD | NEW |