Eliminate CrosLibrary::EnsureLoaded

chrome/browser/chromeos/login/version_info_updater.cc

Index: chrome/browser/chromeos/login/version_info_updater.cc
diff --git a/chrome/browser/chromeos/login/version_info_updater.cc b/chrome/browser/chromeos/login/version_info_updater.cc
index 4ba958469d467d80129c130ebf1ca0b3bda084d3..b4707de0625363b149ae5fa39707139eb6447055 100644
--- a/chrome/browser/chromeos/login/version_info_updater.cc
+++ b/chrome/browser/chromeos/login/version_info_updater.cc
@@ -43,7 +43,7 @@ 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)),
@@ -78,7 +78,7 @@ void VersionInfoUpdater::StartUpdate(bool is_official_build) {
 }
 
 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());