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

chrome/common/pref_service_unittest.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/file_util.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_types.h"
@@ skipping 137 matching lines @@
 
   PrefService prefs;
 
   std::wstring persistent_file = data_dir_;
   file_util::AppendToPath(&persistent_file, L"overlay.json");
   EXPECT_TRUE(prefs.LoadPersistentPrefs(persistent_file));
 
   Value* transient_value;
   {
     JSONStringValueSerializer serializer(transient);
-    ASSERT_TRUE(serializer.Deserialize(&transient_value, NULL));
+    transient_value = serializer.Deserialize(NULL);
+    ASSERT_TRUE(transient_value);
   }
   prefs.transient()->Set(transient_string, transient_value);
 
   Value* both_transient_value;
   {
     JSONStringValueSerializer serializer(transient);
-    ASSERT_TRUE(serializer.Deserialize(&both_transient_value, NULL));
+    both_transient_value = serializer.Deserialize(NULL);
+    ASSERT_TRUE(both_transient_value);
   }
   prefs.transient()->Set(L"both", both_transient_value);
 
   // Register test prefs
   static const std::wstring kTypes[] =
       { L"neither.", L"persistent.", L"transient.", L"both." };
   for (size_t i = 0; i < arraysize(kTypes); ++i) {
     prefs.RegisterBooleanPref((kTypes[i] + L"bool").c_str(), false);
     prefs.RegisterIntegerPref((kTypes[i] + L"int").c_str(), 0);
     prefs.RegisterRealPref((kTypes[i] + L"real").c_str(), 0.0);
@@ skipping 206 matching lines @@
   // Register the path. This doesn't set a value, so the path still shouldn't
   // exist.
   prefs.RegisterStringPref(path, std::wstring());
   EXPECT_FALSE(prefs.HasPrefPath(path));
 
   // Set a value and make sure we have a path.
   prefs.persistent_->SetString(path, L"blah");
   EXPECT_TRUE(prefs.HasPrefPath(path));
 }