Eliminate CrosLibrary::EnsureLoaded

chrome/browser/chromeos/login/eula_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/eula_screen.h"
 
 #include "base/logging.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
@@ skipping 10 matching lines @@
   if (actor_)
     actor_->SetDelegate(NULL);
 }
 
 void EulaScreen::PrepareToShow() {
   actor_->PrepareToShow();
 }
 
 void EulaScreen::Show() {
   // Command to own the TPM.
-  if (chromeos::CrosLibrary::Get()->EnsureLoaded()) {
-    chromeos::CrosLibrary::Get()->
-        GetCryptohomeLibrary()->TpmCanAttemptOwnership();
-  } else {
-    LOG(ERROR) << "Cros library not loaded. "
-               << "We must have disabled the link that led here.";
-  }
+  chromeos::CrosLibrary::Get()->
+      GetCryptohomeLibrary()->TpmCanAttemptOwnership();
   actor_->Show();
 }
 
 void EulaScreen::Hide() {
   actor_->Hide();
 }
 
 bool EulaScreen::IsTpmEnabled() const {
-  return chromeos::CrosLibrary::Get()->EnsureLoaded() &&
-         chromeos::CrosLibrary::Get()->GetCryptohomeLibrary()->TpmIsEnabled();
+  return chromeos::CrosLibrary::Get()->GetCryptohomeLibrary()->TpmIsEnabled();
 }
 
 GURL EulaScreen::GetOemEulaUrl() const {
   const StartupCustomizationDocument* customization =
       StartupCustomizationDocument::GetInstance();
   if (customization->IsReady()) {
     std::string locale = customization->initial_locale();
     std::string eula_page = customization->GetEULAPage(locale);
     if (!eula_page.empty())
       return GURL(eula_page);
@@ skipping 30 matching lines @@
 bool EulaScreen::IsUsageStatsEnabled() const {
   return get_screen_observer()->usage_statistics_reporting();
 }
 
 void EulaScreen::OnActorDestroyed(EulaScreenActor* actor) {
   if (actor_ == actor)
     actor_ = NULL;
 }
 
 }  // namespace chromeos