Eliminate CrosLibrary::EnsureLoaded

chrome/browser/chromeos/login/update_screen.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/update_screen.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 166 matching lines @@
     case UPDATE_STATUS_REPORTING_ERROR_EVENT:
       ExitUpdate(REASON_UPDATE_ENDED);
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 void UpdateScreen::StartUpdate() {
-  if (!CrosLibrary::Get()->EnsureLoaded()) {
-    LOG(ERROR) << "Error loading CrosLibrary";
-    ExitUpdate(REASON_UPDATE_INIT_FAILED);
-  } else {
-    CrosLibrary::Get()->GetUpdateLibrary()->AddObserver(this);
-    VLOG(1) << "Initiate update check";
-    CrosLibrary::Get()->GetUpdateLibrary()->RequestUpdateCheck(
-        StartUpdateCallback, this);
-  }
+  CrosLibrary::Get()->GetUpdateLibrary()->AddObserver(this);
+  VLOG(1) << "Initiate update check";
+  CrosLibrary::Get()->GetUpdateLibrary()->RequestUpdateCheck(
+      StartUpdateCallback, this);
 }
 
 void UpdateScreen::CancelUpdate() {
   VLOG(1) << "Forced update cancel";
   ExitUpdate(REASON_UPDATE_CANCELED);
 }
 
 void UpdateScreen::Show() {
   is_shown_ = true;
   actor_->Show();
   actor_->SetProgress(kBeforeUpdateCheckProgress);
 }
 
 void UpdateScreen::Hide() {
   actor_->Hide();
   is_shown_ = false;
 }
 
 void UpdateScreen::PrepareToShow() {
   actor_->PrepareToShow();
 }
 
 void UpdateScreen::ExitUpdate(UpdateScreen::ExitReason reason) {
-  if (CrosLibrary::Get()->EnsureLoaded())
-    CrosLibrary::Get()->GetUpdateLibrary()->RemoveObserver(this);
+  CrosLibrary::Get()->GetUpdateLibrary()->RemoveObserver(this);
 
   switch (reason) {
     case REASON_UPDATE_CANCELED:
       get_screen_observer()->OnExit(ScreenObserver::UPDATE_NOUPDATE);
       break;
     case REASON_UPDATE_INIT_FAILED:
       get_screen_observer()->OnExit(
           ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE);
       break;
     case REASON_UPDATE_NON_CRITICAL:
@@ skipping 68 matching lines @@
   // if the file exists and not empty, there is critical update.
   return true;
 }
 
 void UpdateScreen::OnActorDestroyed(UpdateScreenActor* actor) {
   if (actor_ == actor)
     actor_ = NULL;
 }
 
 }  // namespace chromeos