From 6351d7c368bd5857df10859bc23060bd4ebf9b19 Mon Sep 17 00:00:00 2001 From: "achuith@chromium.org" Date: Fri, 8 Aug 2014 20:50:14 +0000 Subject: Set oem_manifest_loaded_ to true only after the manifest is actually loaded. Still seeing log spam because we set oem_manifest_loaded_ to true even if the file doesn't exist. Follow-up to r239700 BUG=314793 TEST=remove oem manifest.json - should not see spam in log file. Review URL: https://codereview.chromium.org/448403002 Cr-Commit-Position: refs/heads/master@{#288423} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288423 0039d316-1c4b-4281-b951-d872f2087c98 --- chromeos/system/statistics_provider.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chromeos/system') diff --git a/chromeos/system/statistics_provider.cc b/chromeos/system/statistics_provider.cc index a829c35..60b3c4b 100644 --- a/chromeos/system/statistics_provider.cc +++ b/chromeos/system/statistics_provider.cc @@ -267,7 +267,6 @@ void StatisticsProviderImpl::LoadMachineStatistics(bool load_oem_manifest) { } else if (base::SysInfo::IsRunningOnChromeOS()) { LoadOemManifestFromFile(base::FilePath(kOemManifestFilePath)); } - oem_manifest_loaded_ = true; } if (!base::SysInfo::IsRunningOnChromeOS() && @@ -306,6 +305,7 @@ void StatisticsProviderImpl::LoadOemManifestFromFile( machine_flags_[kOemKeyboardDrivenOobeKey] = oem_manifest.keyboard_driven_oobe; + oem_manifest_loaded_ = true; VLOG(1) << "Loaded OEM Manifest statistics from " << file.value(); } -- cgit v1.1