diff options
author | estade <estade@chromium.org> | 2015-05-22 09:30:13 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-22 16:30:52 +0000 |
commit | b09312bb5ad1bffaad8a09deea395f1aef2053df (patch) | |
tree | ea13602ed858503180cd725d1afe6a4ce73a2bd9 /components/invalidation/p2p_invalidator.cc | |
parent | 2d381b0799c9fbbd33fbfa5ccf6610794d454f71 (diff) | |
download | chromium_src-b09312bb5ad1bffaad8a09deea395f1aef2053df.zip chromium_src-b09312bb5ad1bffaad8a09deea395f1aef2053df.tar.gz chromium_src-b09312bb5ad1bffaad8a09deea395f1aef2053df.tar.bz2 |
Use scoped_ptrs in JSONReader::Read functions.
There are many callers, so all could not be updated at once. The old version is renamed to JSONReader::DeprecatedRead, and a new version of JSONReader::Read that returns scoped_ptr takes its place.
Much of this patch was generated with sed. Some callsites of the form
scoped_ptr<Value> value(Read());
have been updated to
scoped_ptr<Value> value = Read();
but most Read() calls are simply converted to DeprecatedRead. Actually updating them is a TODO.
BUG=none
Review URL: https://codereview.chromium.org/1136643005
Cr-Commit-Position: refs/heads/master@{#331120}
Diffstat (limited to 'components/invalidation/p2p_invalidator.cc')
-rw-r--r-- | components/invalidation/p2p_invalidator.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/invalidation/p2p_invalidator.cc b/components/invalidation/p2p_invalidator.cc index e6c03b5..aea1e3a 100644 --- a/components/invalidation/p2p_invalidator.cc +++ b/components/invalidation/p2p_invalidator.cc @@ -112,7 +112,7 @@ std::string P2PNotificationData::ToString() const { } bool P2PNotificationData::ResetFromString(const std::string& str) { - scoped_ptr<base::Value> data_value(base::JSONReader::Read(str)); + scoped_ptr<base::Value> data_value = base::JSONReader::Read(str); const base::DictionaryValue* data_dict = NULL; if (!data_value.get() || !data_value->GetAsDictionary(&data_dict)) { LOG(WARNING) << "Could not parse " << str << " as a dictionary"; |