Change JSONReader::ReadToValue to return a scoped_ptr

chrome/test/nacl/nacl_browsertest_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/nacl/nacl_browsertest_util.h"
 
 #include <stdlib.h>
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/path_service.h"
 #include "base/values.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/webplugininfo.h"
 #include "net/base/net_util.h"
 
 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());
 
   std::string temp;
   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());
 
   base::DictionaryValue* msg;
   if (!value->GetAsDictionary(&msg))
     return InternalError("Message was not an object: " + temp);
 
   std::string type;
   if (!msg->GetString("type", &type))
@@ skipping 306 matching lines @@
   // to point at the isolated the test extension directory.
   // Otherwise, multiple NaCl extensions tests will end up sharing the
   // same directory when loading the extension files.
   base::FilePath document_root;
   ASSERT_TRUE(GetDocumentRoot(&document_root));
 
   // Document root is relative to source root, and source root may not be CWD.
   command_line->AppendSwitchPath(switches::kLoadExtension,
                                  src_root.Append(document_root));
 }