diff options
author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-29 19:59:08 +0000 |
---|---|---|
committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-29 19:59:08 +0000 |
commit | b4cebf87816cde49f6d4991ffa254e5ead97703b (patch) | |
tree | fb12e4b464a43af846f30bbd0dbe9484150373b0 /chrome/common/pref_service_unittest.cc | |
parent | 45ce59f19161b517c04a4e3bcd0890b938382b06 (diff) | |
download | chromium_src-b4cebf87816cde49f6d4991ffa254e5ead97703b.zip chromium_src-b4cebf87816cde49f6d4991ffa254e5ead97703b.tar.gz chromium_src-b4cebf87816cde49f6d4991ffa254e5ead97703b.tar.bz2 |
Change the signature of JSONReader::Read() and related
methods to be more friendly to use with scoped_ptr. Change
all the callsites.
Review URL: http://codereview.chromium.org/16270
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7486 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/pref_service_unittest.cc')
-rw-r--r-- | chrome/common/pref_service_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/common/pref_service_unittest.cc b/chrome/common/pref_service_unittest.cc index 2baa908..e35e44a 100644 --- a/chrome/common/pref_service_unittest.cc +++ b/chrome/common/pref_service_unittest.cc @@ -155,14 +155,16 @@ TEST_F(PrefServiceTest, Overlay) { 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); |