diff options
author | estade <estade@chromium.org> | 2015-05-20 15:46:58 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-20 22:47:07 +0000 |
commit | 69505deccedb458e39a3593888e50627467870fb (patch) | |
tree | 26daf20256e472dc78f215d9cad913cccf3780f7 /chrome/test/nacl | |
parent | 678b1e5a2bce8aff7b1099c001687061fc031e84 (diff) | |
download | chromium_src-69505deccedb458e39a3593888e50627467870fb.zip chromium_src-69505deccedb458e39a3593888e50627467870fb.tar.gz chromium_src-69505deccedb458e39a3593888e50627467870fb.tar.bz2 |
Change JSONReader::ReadToValue to return a scoped_ptr
BUG=none
Review URL: https://codereview.chromium.org/1124223012
Cr-Commit-Position: refs/heads/master@{#330823}
Diffstat (limited to 'chrome/test/nacl')
-rw-r--r-- | chrome/test/nacl/nacl_browsertest_util.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/test/nacl/nacl_browsertest_util.cc b/chrome/test/nacl/nacl_browsertest_util.cc index 7d63c84..bd79bdf 100644 --- a/chrome/test/nacl/nacl_browsertest_util.cc +++ b/chrome/test/nacl/nacl_browsertest_util.cc @@ -24,12 +24,11 @@ typedef content::TestMessageHandler::MessageResponse MessageResponse; MessageResponse StructuredMessageHandler::HandleMessage( const std::string& json) { - scoped_ptr<base::Value> value; base::JSONReader reader(base::JSON_ALLOW_TRAILING_COMMAS); // Automation messages are stringified before they are sent because the // automation channel cannot handle arbitrary objects. This means we // need to decode the json twice to get the original message. - value.reset(reader.ReadToValue(json)); + scoped_ptr<base::Value> value = reader.ReadToValue(json); if (!value.get()) return InternalError("Could parse automation JSON: " + json + " because " + reader.GetErrorMessage()); @@ -38,7 +37,7 @@ MessageResponse StructuredMessageHandler::HandleMessage( if (!value->GetAsString(&temp)) return InternalError("Message was not a string: " + json); - value.reset(reader.ReadToValue(temp)); + value = reader.ReadToValue(temp); if (!value.get()) return InternalError("Could not parse message JSON: " + temp + " because " + reader.GetErrorMessage()); |