Chromium Code Reviews| Index: components/safe_json/utility/safe_json_parser_mojo_impl.cc |
| diff --git a/components/safe_json/utility/safe_json_parser_mojo_impl.cc b/components/safe_json/utility/safe_json_parser_mojo_impl.cc |
| index f3d11aae88e93242cd76a8eb7ab97f74e3df41e7..fe168918a350b2be8bd1ec82b1dd22da6840e7fe 100644 |
| --- a/components/safe_json/utility/safe_json_parser_mojo_impl.cc |
| +++ b/components/safe_json/utility/safe_json_parser_mojo_impl.cc |
| @@ -24,16 +24,16 @@ void SafeJsonParserMojoImpl::Create( |
| std::move(request)); |
| } |
| -void SafeJsonParserMojoImpl::Parse(const mojo::String& json, |
| +void SafeJsonParserMojoImpl::Parse(const std::string& json, |
| const ParseCallback& callback) { |
| int error_code; |
| std::string error; |
| std::unique_ptr<base::Value> value = base::JSONReader::ReadAndReturnError( |
| - json.get(), base::JSON_PARSE_RFC, &error_code, &error); |
| + json, base::JSON_PARSE_RFC, &error_code, &error); |
| base::ListValue wrapper; |
| if (value) { |
| wrapper.Append(std::move(value)); |
| - callback.Run(wrapper, nullptr); |
| + callback.Run(wrapper, base::nullopt); |
|
blundell
2016/11/08 08:32:41
why this change?
yzshen1
2016/11/09 17:13:22
Because the parameter type has changed from mojo::
|
| } else { |
| callback.Run(wrapper, error); |
| } |