Make ValueDeserializer::Deserialize return scoped_ptr

base/json/json_file_value_serializer.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/json/json_file_value_serializer.h"
 
 #include "base/files/file_util.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
 
@@ skipping 82 matching lines @@
     case JSON_FILE_LOCKED:
       return kFileLocked;
     case JSON_NO_SUCH_FILE:
       return kNoSuchFile;
     default:
       NOTREACHED();
       return "";
   }
 }
 
-base::Value* JSONFileValueDeserializer::Deserialize(int* error_code,
-                                                    std::string* error_str) {
+scoped_ptr<base::Value> JSONFileValueDeserializer::Deserialize(
+    int* error_code,
+    std::string* error_str) {
   std::string json_string;
   int error = ReadFileToString(&json_string);
   if (error != JSON_NO_ERROR) {
     if (error_code)
       *error_code = error;
     if (error_str)
       *error_str = GetErrorMessageForCode(error);
     return NULL;
   }
 
   JSONStringValueDeserializer deserializer(json_string);
   deserializer.set_allow_trailing_comma(allow_trailing_comma_);
   return deserializer.Deserialize(error_code, error_str);
 }