More base::Values-related bare pointer -> scoped_ptr conversions

base/test/values_test_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 "base/test/values_test_util.h"
 
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
@@ skipping 51 matching lines @@
 
 namespace test {
 
 scoped_ptr<Value> ParseJson(base::StringPiece json) {
   std::string error_msg;
   scoped_ptr<Value> result(base::JSONReader::ReadAndReturnError(
       json, base::JSON_ALLOW_TRAILING_COMMAS,
       NULL, &error_msg));
   if (!result) {
     ADD_FAILURE() << "Failed to parse \"" << json << "\": " << error_msg;
-    result.reset(Value::CreateNullValue());
+    result = Value::CreateNullValue();
   }
   return result.Pass();
 }
 
 }  // namespace test
 }  // namespace base