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

chrome/common/pref_service_uitest.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 <string>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/values.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 64 matching lines @@
   std::wstring tmp_profile_;
 };
 
 TEST_F(PreferenceServiceTest, PreservedWindowPlacementIsLoaded) {
   // The window should open with the reference profile
   ASSERT_TRUE(LaunchAppWithProfile());
 
   ASSERT_TRUE(file_util::PathExists(tmp_pref_file_));
 
   JSONFileValueSerializer deserializer(tmp_pref_file_);
-  Value* root = NULL;
-  ASSERT_TRUE(deserializer.Deserialize(&root, NULL));
+  scoped_ptr<Value> root(deserializer.Deserialize(NULL));
 
-  ASSERT_TRUE(root);
+  ASSERT_TRUE(root.get());
   ASSERT_TRUE(root->IsType(Value::TYPE_DICTIONARY));
 
-  DictionaryValue* root_dict = static_cast<DictionaryValue*>(root);
+  DictionaryValue* root_dict = static_cast<DictionaryValue*>(root.get());
 
   // Retrieve the screen rect for the launched window
   scoped_ptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   scoped_ptr<WindowProxy> window(
       automation()->GetWindowForBrowser(browser.get()));
   HWND hWnd;
   ASSERT_TRUE(window->GetHWND(&hWnd));
 
   WINDOWPLACEMENT window_placement;
@@ skipping 21 matching lines @@
       &right));
   ASSERT_EQ(right, window_placement.rcNormalPosition.right);
 
   // Find if launched window is maximized
   bool is_window_maximized = (window_placement.showCmd == SW_MAXIMIZE);
 
   bool is_maximized = false;
   ASSERT_TRUE(root_dict->GetBoolean(kBrowserWindowPlacement + L".maximized",
       &is_maximized));
   ASSERT_EQ(is_maximized, is_window_maximized);
-  delete root;
 }