Change the signature of JSONReader::Read() and related

methods to be more friendly to use with scoped_ptr. Change
all the callsites.

Review URL: http://codereview.chromium.org/16270

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7486 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 7 deletions

diff --git a/chrome/common/json_value_serializer.cc b/chrome/common/json_value_serializer.cc
index 82938ec..54afe7a 100644
--- a/chrome/common/json_value_serializer.cc
+++ b/chrome/common/json_value_serializer.cc
@@ -21,13 +21,11 @@ bool JSONStringValueSerializer::Serialize(const Value& root) {
   return true;
 }
 
-bool JSONStringValueSerializer::Deserialize(Value** root,
-                                            std::string* error_message) {
+Value* JSONStringValueSerializer::Deserialize(std::string* error_message) {
   if (!json_string_)
     return false;
 
-  return JSONReader::ReadAndReturnError(*json_string_, root,
-                                        allow_trailing_comma_,
+  return JSONReader::ReadAndReturnError(*json_string_, allow_trailing_comma_,
                                         error_message);
 }
 
@@ -50,13 +48,12 @@ bool JSONFileValueSerializer::Serialize(const Value& root) {
   return true;
 }
 
-bool JSONFileValueSerializer::Deserialize(Value** root,
-                                          std::string* error_message) {
+Value* JSONFileValueSerializer::Deserialize(std::string* error_message) {
   std::string json_string;
   if (!file_util::ReadFileToString(json_file_path_, &json_string)) {
     return false;
   }
   JSONStringValueSerializer serializer(json_string);
-  return serializer.Deserialize(root, error_message);
+  return serializer.Deserialize(error_message);
 }