Make ValueDeserializer::Deserialize return scoped_ptr

base/test/gtest_util.cc

 // Copyright 2014 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/gtest_util.h"
 
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 42 matching lines @@
 
   JSONFileValueSerializer serializer(path);
   return serializer.Serialize(root);
 }
 
 bool ReadTestNamesFromFile(const FilePath& path,
                            std::vector<TestIdentifier>* output) {
   JSONFileValueDeserializer deserializer(path);
   int error_code = 0;
   std::string error_message;
-  scoped_ptr<base::Value> value(
-      deserializer.Deserialize(&error_code, &error_message));
+  scoped_ptr<base::Value> value =
+      deserializer.Deserialize(&error_code, &error_message);
   if (!value.get())
     return false;
 
   base::ListValue* tests = nullptr;
   if (!value->GetAsList(&tests))
     return false;
 
   std::vector<base::TestIdentifier> result;
   for (base::ListValue::iterator i = tests->begin(); i != tests->end(); ++i) {
     base::DictionaryValue* test = nullptr;
@@ skipping 15 matching lines @@
       return false;
 
     result.push_back(test_data);
   }
 
   output->swap(result);
   return true;
 }
 
 }  // namespace base