diff options
| author | olli.raula <olli.raula@intel.com> | 2015-10-15 23:16:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-16 06:17:31 +0000 |
| commit | ba04525cccccae530aa899882227d81b037eebff (patch) | |
| tree | 311a935c17622cd982a5ee637005c3836c2ae84a /base/prefs | |
| parent | 1737f9e86e74990aad0e9693ebf247c8ffbb86f9 (diff) | |
| download | chromium_src-ba04525cccccae530aa899882227d81b037eebff.zip chromium_src-ba04525cccccae530aa899882227d81b037eebff.tar.gz chromium_src-ba04525cccccae530aa899882227d81b037eebff.tar.bz2 | |
Make ValueDeserializer::Deserialize return scoped_ptr
Make ValueDeserializer::Deserialize return scoped_ptr
as almost all consumers already use scoped_ptr and it
is also better way to do it.
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/1394993004
Cr-Commit-Position: refs/heads/master@{#354458}
Diffstat (limited to 'base/prefs')
| -rw-r--r-- | base/prefs/json_pref_store.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/prefs/json_pref_store.cc b/base/prefs/json_pref_store.cc index 87943d1..22036de 100644 --- a/base/prefs/json_pref_store.cc +++ b/base/prefs/json_pref_store.cc @@ -118,7 +118,7 @@ scoped_ptr<JsonPrefStore::ReadResult> ReadPrefsFromDisk( scoped_ptr<JsonPrefStore::ReadResult> read_result( new JsonPrefStore::ReadResult); JSONFileValueDeserializer deserializer(path); - read_result->value.reset(deserializer.Deserialize(&error_code, &error_msg)); + read_result->value = deserializer.Deserialize(&error_code, &error_msg); read_result->error = HandleReadErrors(read_result->value.get(), path, error_code, error_msg); read_result->no_dir = !base::PathExists(path.DirName()); |