| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "components/safe_json/utility/safe_json_parser_mojo_impl.h" | 5 #include "components/safe_json/utility/safe_json_parser_mojo_impl.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/json/json_reader.h" | 10 #include "base/json/json_reader.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 std::move(request)); | 25 std::move(request)); |
| 26 } | 26 } |
| 27 | 27 |
| 28 void SafeJsonParserMojoImpl::Parse(const std::string& json, | 28 void SafeJsonParserMojoImpl::Parse(const std::string& json, |
| 29 const ParseCallback& callback) { | 29 const ParseCallback& callback) { |
| 30 int error_code; | 30 int error_code; |
| 31 std::string error; | 31 std::string error; |
| 32 std::unique_ptr<base::Value> value = base::JSONReader::ReadAndReturnError( | 32 std::unique_ptr<base::Value> value = base::JSONReader::ReadAndReturnError( |
| 33 json, base::JSON_PARSE_RFC, &error_code, &error); | 33 json, base::JSON_PARSE_RFC, &error_code, &error); |
| 34 if (value) { | 34 if (value) { |
| 35 callback.Run(std::move(value), base::nullopt); | 35 callback.Run(*value, base::nullopt); |
| 36 } else { | 36 } else { |
| 37 callback.Run(nullptr, base::make_optional(std::move(error))); | 37 callback.Run(base::nullopt, base::make_optional(std::move(error))); |
| 38 } | 38 } |
| 39 } | 39 } |
| 40 | 40 |
| 41 } // namespace safe_json | 41 } // namespace safe_json |
| OLD | NEW |