summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorolli.raula <olli.raula@intel.com>2015-10-15 23:16:40 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-16 06:17:31 +0000
commitba04525cccccae530aa899882227d81b037eebff (patch)
tree311a935c17622cd982a5ee637005c3836c2ae84a /chrome/common
parent1737f9e86e74990aad0e9693ebf247c8ffbb86f9 (diff)
downloadchromium_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 'chrome/common')
-rw-r--r--chrome/common/component_flash_hint_file_linux.cc4
-rw-r--r--chrome/common/extensions/extension_test_util.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/common/component_flash_hint_file_linux.cc b/chrome/common/component_flash_hint_file_linux.cc
index 160c8e8..32d856e 100644
--- a/chrome/common/component_flash_hint_file_linux.cc
+++ b/chrome/common/component_flash_hint_file_linux.cc
@@ -156,8 +156,8 @@ bool VerifyAndReturnFlashLocation(base::FilePath* path,
int error_code;
std::string error_message;
JSONStringValueDeserializer deserializer(json_string);
- const scoped_ptr<base::Value> value(
- deserializer.Deserialize(&error_code, &error_message));
+ const scoped_ptr<base::Value> value =
+ deserializer.Deserialize(&error_code, &error_message);
if (!value) {
LOG(ERROR)
diff --git a/chrome/common/extensions/extension_test_util.cc b/chrome/common/extensions/extension_test_util.cc
index ec223f6..697be60 100644
--- a/chrome/common/extensions/extension_test_util.cc
+++ b/chrome/common/extensions/extension_test_util.cc
@@ -31,7 +31,7 @@ scoped_refptr<Extension> LoadManifestUnchecked(const std::string& dir,
.AppendASCII(test_file);
JSONFileValueDeserializer deserializer(path);
- scoped_ptr<base::Value> result(deserializer.Deserialize(NULL, error));
+ scoped_ptr<base::Value> result = deserializer.Deserialize(NULL, error);
if (!result)
return NULL;
const base::DictionaryValue* dict;