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

chrome/browser/extensions/extensions_service.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 "chrome/browser/extensions/extensions_service.h"
 
 #include "base/file_util.h"
 #include "base/values.h"
 #include "base/string_util.h"
 #include "base/thread.h"
@@ skipping 70 matching lines @@
   for (FilePath child_path = enumerator.Next(); !child_path.value().empty();
        child_path = enumerator.Next()) {
     FilePath manifest_path = child_path.Append(Extension::kManifestFilename);
     if (!file_util::PathExists(manifest_path)) {
       ReportExtensionLoadError(frontend.get(), child_path.ToWStringHack(),
                                Extension::kInvalidManifestError);
       continue;
     }
 
     JSONFileValueSerializer serializer(manifest_path.ToWStringHack());
-    Value* root = NULL;
     std::string error;
-    if (!serializer.Deserialize(&root, &error)) {
+    scoped_ptr<Value> root(serializer.Deserialize(&error));
+    if (!root.get()) {
       ReportExtensionLoadError(frontend.get(), child_path.ToWStringHack(),
                                error);
       continue;
     }
 
-    scoped_ptr<Value> scoped_root(root);
     if (!root->IsType(Value::TYPE_DICTIONARY)) {
       ReportExtensionLoadError(frontend.get(), child_path.ToWStringHack(),
                                Extension::kInvalidManifestError);
       continue;
     }
 
     scoped_ptr<Extension> extension(new Extension(child_path));
-    if (!extension->InitFromValue(*static_cast<DictionaryValue*>(root),
+    if (!extension->InitFromValue(*static_cast<DictionaryValue*>(root.get()),
                                   &error)) {
       ReportExtensionLoadError(frontend.get(), child_path.ToWStringHack(),
                                error);
       continue;
     }
 
     extensions->push_back(extension.release());
   }
 
   ReportExtensionsLoaded(frontend.get(), extensions.release());
@@ skipping 10 matching lines @@
       message));
 }
 
 void ExtensionsServiceBackend::ReportExtensionsLoaded(
     ExtensionsServiceFrontendInterface *frontend, ExtensionList* extensions) {
   frontend->GetMessageLoop()->PostTask(FROM_HERE, NewRunnableMethod(
       frontend,
       &ExtensionsServiceFrontendInterface::OnExtensionsLoadedFromDirectory,
       extensions));
 }