summaryrefslogtreecommitdiffstats
path: root/components/search_provider_logos/logo_cache.cc
diff options
context:
space:
mode:
authorestade <estade@chromium.org>2015-05-22 09:30:13 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-22 16:30:52 +0000
commitb09312bb5ad1bffaad8a09deea395f1aef2053df (patch)
treeea13602ed858503180cd725d1afe6a4ce73a2bd9 /components/search_provider_logos/logo_cache.cc
parent2d381b0799c9fbbd33fbfa5ccf6610794d454f71 (diff)
downloadchromium_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/search_provider_logos/logo_cache.cc')
-rw-r--r--components/search_provider_logos/logo_cache.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/search_provider_logos/logo_cache.cc b/components/search_provider_logos/logo_cache.cc
index c6272ee..6f0ae36 100644
--- a/components/search_provider_logos/logo_cache.cc
+++ b/components/search_provider_logos/logo_cache.cc
@@ -115,7 +115,7 @@ scoped_ptr<EncodedLogo> LogoCache::GetCachedLogo() {
// static
scoped_ptr<LogoMetadata> LogoCache::LogoMetadataFromString(
const std::string& str, int* logo_num_bytes) {
- scoped_ptr<base::Value> value(base::JSONReader::Read(str));
+ scoped_ptr<base::Value> value = base::JSONReader::Read(str);
base::DictionaryValue* dict;
if (!value || !value->GetAsDictionary(&dict))
return scoped_ptr<LogoMetadata>();