Set oem_manifest_loaded_ to true only after the manifest is actually loaded.

chromeos/system/statistics_provider.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/system/statistics_provider.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
@@ skipping 249 matching lines @@
 
   if (load_oem_manifest) {
     // If kAppOemManifestFile switch is specified, load OEM Manifest file.
     CommandLine* command_line = CommandLine::ForCurrentProcess();
     if (command_line->HasSwitch(switches::kAppOemManifestFile)) {
       LoadOemManifestFromFile(
           command_line->GetSwitchValuePath(switches::kAppOemManifestFile));
     } else if (base::SysInfo::IsRunningOnChromeOS()) {
       LoadOemManifestFromFile(base::FilePath(kOemManifestFilePath));
     }
-    oem_manifest_loaded_ = true;
   }
 
   if (!base::SysInfo::IsRunningOnChromeOS() &&
       machine_info_.find(kSerialNumber) == machine_info_.end()) {
     // Set stub value for testing. A time value is appended to avoid clashes of
     // the same serial for the same domain, which would invalidate earlier
     // enrollments. A fake /tmp/machine-info file should be used instead if
     // a stable serial is needed, e.g. to test re-enrollment.
     base::TimeDelta time = base::Time::Now() - base::Time::UnixEpoch();
     machine_info_[kSerialNumber] =
@@ skipping 18 matching lines @@
   }
   machine_info_[kOemDeviceRequisitionKey] =
       oem_manifest.device_requisition;
   machine_flags_[kOemIsEnterpriseManagedKey] =
       oem_manifest.enterprise_managed;
   machine_flags_[kOemCanExitEnterpriseEnrollmentKey] =
       oem_manifest.can_exit_enrollment;
   machine_flags_[kOemKeyboardDrivenOobeKey] =
       oem_manifest.keyboard_driven_oobe;
 
+  oem_manifest_loaded_ = true;
   VLOG(1) << "Loaded OEM Manifest statistics from " << file.value();
 }
 
 StatisticsProviderImpl* StatisticsProviderImpl::GetInstance() {
   return Singleton<StatisticsProviderImpl,
                    DefaultSingletonTraits<StatisticsProviderImpl> >::get();
 }
 
 static StatisticsProvider* g_test_statistics_provider = NULL;
 
 // static
 StatisticsProvider* StatisticsProvider::GetInstance() {
   if (g_test_statistics_provider)
     return g_test_statistics_provider;
   return StatisticsProviderImpl::GetInstance();
 }
 
 // static
 void StatisticsProvider::SetTestProvider(StatisticsProvider* test_provider) {
   g_test_statistics_provider = test_provider;
 }
 
 }  // namespace system
 }  // namespace chromeos