| 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" |
| 11 #include "base/values.h" | 11 #include "base/values.h" |
| 12 #include "mojo/public/cpp/bindings/strong_binding.h" | 12 #include "mojo/public/cpp/bindings/strong_binding.h" |
| 13 | 13 |
| 14 namespace safe_json { | 14 namespace safe_json { |
| 15 | 15 |
| 16 SafeJsonParserMojoImpl::SafeJsonParserMojoImpl() = default; | 16 SafeJsonParserMojoImpl::SafeJsonParserMojoImpl() = default; |
| 17 | 17 |
| 18 SafeJsonParserMojoImpl::~SafeJsonParserMojoImpl() = default; | 18 SafeJsonParserMojoImpl::~SafeJsonParserMojoImpl() = default; |
| 19 | 19 |
| 20 // static | 20 // static |
| 21 void SafeJsonParserMojoImpl::Create( | 21 void SafeJsonParserMojoImpl::Create( |
| 22 mojo::InterfaceRequest<mojom::SafeJsonParser> request) { | 22 mojo::InterfaceRequest<mojom::SafeJsonParser> request) { |
| 23 mojo::MakeStrongBinding(base::MakeUnique<SafeJsonParserMojoImpl>(), | 23 mojo::MakeStrongBinding(base::MakeUnique<SafeJsonParserMojoImpl>(), |
| 24 std::move(request)); | 24 std::move(request)); |
| 25 } | 25 } |
| 26 | 26 |
| 27 void SafeJsonParserMojoImpl::Parse(const mojo::String& json, | 27 void SafeJsonParserMojoImpl::Parse(const std::string& json, |
| 28 const ParseCallback& callback) { | 28 const ParseCallback& callback) { |
| 29 int error_code; | 29 int error_code; |
| 30 std::string error; | 30 std::string error; |
| 31 std::unique_ptr<base::Value> value = base::JSONReader::ReadAndReturnError( | 31 std::unique_ptr<base::Value> value = base::JSONReader::ReadAndReturnError( |
| 32 json.get(), base::JSON_PARSE_RFC, &error_code, &error); | 32 json, base::JSON_PARSE_RFC, &error_code, &error); |
| 33 base::ListValue wrapper; | 33 base::ListValue wrapper; |
| 34 if (value) { | 34 if (value) { |
| 35 wrapper.Append(std::move(value)); | 35 wrapper.Append(std::move(value)); |
| 36 callback.Run(wrapper, nullptr); | 36 callback.Run(wrapper, base::nullopt); |
| 37 } else { | 37 } else { |
| 38 callback.Run(wrapper, error); | 38 callback.Run(wrapper, base::make_optional(std::move(error))); |
| 39 } | 39 } |
| 40 } | 40 } |
| 41 | 41 |
| 42 } // namespace safe_json | 42 } // namespace safe_json |
| OLD | NEW |