chromeos/system/statistics_provider.cc - Issue 1394993004: Make ValueDeserializer::Deserialize return scoped_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromeos/system/statistics_provider.cc

Issue 1394993004: Make ValueDeserializer::Deserialize return scoped_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix and add ::From Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chromeos/network/onc/onc_utils_unittest.cc ('K') | « chromeos/network/onc/onc_utils_unittest.cc ('k') | chromeos/tools/onc_validator/onc_validator.cc » ('j') | chromeos/tools/onc_validator/onc_validator.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromeos/system/statistics_provider.cc

diff --git a/chromeos/system/statistics_provider.cc b/chromeos/system/statistics_provider.cc

index 834f0b6a80d41584f486e6e92a22d06d2fcc6cb6..6f86dfb7afa017881e976ef9d4f054a9a2f301de 100644

--- a/chromeos/system/statistics_provider.cc

+++ b/chromeos/system/statistics_provider.cc

@@ -503,8 +503,8 @@ void StatisticsProviderImpl::LoadRegionsFile(const base::FilePath& filename) {

JSONFileValueDeserializer regions_file(filename);

int regions_error_code = 0;

std::string regions_error_message;

- regional_data_.reset(

- regions_file.Deserialize(&regions_error_code, &regions_error_message));

+ regional_data_ =

+ regions_file.Deserialize(&regions_error_code, &regions_error_message);

if (!regional_data_.get()) {

if (base::SysInfo::IsRunningOnChromeOS())

LOG(ERROR) << "Failed to load regions file '" << filename.value()