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

chrome/browser/bookmarks/bookmark_storage.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/bookmarks/bookmark_storage.h"
 
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/json_writer.h"
 #include "base/message_loop.h"
@@ skipping 149 matching lines @@
 }
 
 void BookmarkStorageBackend::Read(scoped_refptr<BookmarkStorage> service,
                                   MessageLoop* message_loop,
                                   bool load_from_history) {
   const std::wstring& path = load_from_history ? tmp_history_path_ : path_;
   bool bookmark_file_exists = file_util::PathExists(path);
   Value* root = NULL;
   if (bookmark_file_exists) {
     JSONFileValueSerializer serializer(path);
-    serializer.Deserialize(&root, NULL);
+    root = serializer.Deserialize(NULL);
   }
 
   // BookmarkStorage takes ownership of root.
   if (message_loop) {
     message_loop->PostTask(FROM_HERE, NewRunnableMethod(
         service.get(), &BookmarkStorage::LoadedBookmarks, root,
         bookmark_file_exists, load_from_history));
   } else {
     service->LoadedBookmarks(root, bookmark_file_exists, load_from_history);
   }
 }