diff options
| author | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-08 20:50:14 +0000 |
|---|---|---|
| committer | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-08 20:51:59 +0000 |
| commit | 6351d7c368bd5857df10859bc23060bd4ebf9b19 (patch) | |
| tree | 201459dae1a4b6271dbaa5e24c3ac846bf7e6b8f /chromeos/system | |
| parent | a9711bf1cf7d3e6ed417bc9fe8ba8035ab4a7a2d (diff) | |
| download | chromium_src-6351d7c368bd5857df10859bc23060bd4ebf9b19.zip chromium_src-6351d7c368bd5857df10859bc23060bd4ebf9b19.tar.gz chromium_src-6351d7c368bd5857df10859bc23060bd4ebf9b19.tar.bz2 | |
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
Diffstat (limited to 'chromeos/system')
| -rw-r--r-- | chromeos/system/statistics_provider.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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(); } |