Eliminate CrosLibrary::EnsureLoaded

chrome/browser/chromeos/login/version_info_updater.cc

 // Copyright (c) 2011 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 "chrome/browser/chromeos/login/version_info_updater.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 25 matching lines @@
 // VersionInfoUpdater public:
 
 VersionInfoUpdater::VersionInfoUpdater(Delegate* delegate)
     : delegate_(delegate) {
 }
 
 VersionInfoUpdater::~VersionInfoUpdater() {
 }
 
 void VersionInfoUpdater::StartUpdate(bool is_official_build) {
-  if (CrosLibrary::Get()->EnsureLoaded()) {
+  if (CrosLibrary::Get()->libcros_loaded()) {

[satorux1, 2011/11/16 23:51:34]

The version loadeder doesn't seem to depend on libcros. Maybe we should check
system::runtime_environment::IsRunningOnChromeOS() instead, or simply remove the
check.

[stevenjb, 2011/11/17 00:23:33]

Will use system::runtime_environment::IsRunningOnChromeOS().  Didn't want to
mess with the version messaging on linux for now.

     version_loader_.GetVersion(
         &version_consumer_,
         base::Bind(&VersionInfoUpdater::OnVersion, base::Unretained(this)),
         is_official_build ?
             VersionLoader::VERSION_SHORT_WITH_DATE :
             VersionLoader::VERSION_FULL);
     boot_times_loader_.GetBootTimes(
         &boot_times_consumer_,
         NewCallback(this, is_official_build ?
             &VersionInfoUpdater::OnBootTimesNoop :
@@ skipping 14 matching lines @@
         new policy::CloudPolicySubsystem::ObserverRegistrar(
             cloud_policy, this));
 
     // Ensure that we have up-to-date enterprise info in case enterprise policy
     // is already fetched and has finished initialization.
     UpdateEnterpriseInfo();
   }
 }
 
 void VersionInfoUpdater::UpdateVersionLabel() {
-  if (!CrosLibrary::Get()->EnsureLoaded()) {
+  if (!CrosLibrary::Get()->libcros_loaded()) {

[satorux1, 2011/11/16 23:51:34]

ditto.

[stevenjb, 2011/11/17 00:23:33]

ditto.

     if (delegate_) {
       delegate_->OnOSVersionLabelTextUpdated(
           CrosLibrary::Get()->load_error_string());
     }
     return;
   }
 
   if (version_text_.empty())
     return;
 
@@ skipping 108 matching lines @@
     delegate_->OnBootTimesLabelTextUpdated(boot_times_text);
 }
 
 void VersionInfoUpdater::OnPolicyStateChanged(
     policy::CloudPolicySubsystem::PolicySubsystemState state,
     policy::CloudPolicySubsystem::ErrorDetails error_details) {
   UpdateEnterpriseInfo();
 }
 
 }  // namespace chromeos