Change the signature of JSONReader::Read() and related methods to be more

chrome/browser/page_state.cc

 // Copyright (c) 2006-2008 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/basictypes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/browser/page_state.h"
 #include "chrome/common/json_value_serializer.h"
 #include "googleurl/src/gurl.h"
@@ skipping 22 matching lines @@
     }
   }
 }
 
 void PageState::InitWithBytes(const std::string& bytes) {
   // Reset our state. We create a new empty one just in case
   // deserialization fails
   state_.reset(new DictionaryValue);
 
   JSONStringValueSerializer serializer(bytes);
-  Value* root = NULL;
+  scoped_ptr<Value> root(serializer.Deserialize(NULL));
 
-  if (!serializer.Deserialize(&root, NULL))
+  if (!root.get()) {
     NOTREACHED();
+    return;
+  }
 
-  if (root != NULL && root->GetType() == Value::TYPE_DICTIONARY) {
-    state_.reset(static_cast<DictionaryValue*>(root));
-  } else if (root) {
-    delete root;
-  }
+  if (root->GetType() == Value::TYPE_DICTIONARY)
+    state_.reset(static_cast<DictionaryValue*>(root.release()));
 }
 
 void PageState::GetByteRepresentation(std::string* out) const {
   JSONStringValueSerializer serializer(out);
   if (!serializer.Serialize(*state_))
     NOTREACHED();
 }
 
 void PageState::SetProperty(const std::wstring& key,
                                    const std::wstring& value) {
@@ skipping 37 matching lines @@
   return false;
 }
 
 PageState* PageState::Copy() const {
   PageState* copy = new PageState();
   if (state_.get())
     copy->state_.reset(static_cast<DictionaryValue*>(state_->DeepCopy()));
   return copy;
 }