Eliminate CrosLibrary::EnsureLoaded

chrome/browser/chromeos/login/existing_user_controller.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/existing_user_controller.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 272 matching lines @@
 
 void ExistingUserController::OnLoginFailure(const LoginFailure& failure) {
   guest_mode_url_ = GURL::EmptyGURL();
   std::string error = failure.GetErrorString();
 
   // Check networking after trying to login in case user is
   // cached locally or the local admin account.
   bool is_known_user =
       UserManager::Get()->IsKnownUser(last_login_attempt_username_);
   NetworkLibrary* network = CrosLibrary::Get()->GetNetworkLibrary();
-  if (!network || !CrosLibrary::Get()->EnsureLoaded()) {
+  if (!network) {
     ShowError(IDS_LOGIN_ERROR_NO_NETWORK_LIBRARY, error);
   } else if (!network->Connected()) {
     if (is_known_user)
       ShowError(IDS_LOGIN_ERROR_AUTHENTICATING, error);
     else
       ShowError(IDS_LOGIN_ERROR_OFFLINE_FAILED_NETWORK_NOT_CONNECTED, error);
   } else {
     // Network is connected.
     const Network* active_network = network->active_network();
     if (failure.reason() == LoginFailure::NETWORK_AUTH_FAILED &&
@@ skipping 275 matching lines @@
 
 void ExistingUserController::SetOwnerUserInCryptohome() {
   bool trusted_owner_available = user_settings_->RequestTrustedOwner(
       base::Bind(&ExistingUserController::SetOwnerUserInCryptohome,
                  weak_factory_.GetWeakPtr()));
   if (!trusted_owner_available) {
     // Value of owner email is still not verified.
     // Another attempt will be invoked after verification completion.
     return;
   }
-  if (CrosLibrary::Get()->EnsureLoaded()) {
-    CryptohomeLibrary* cryptohomed = CrosLibrary::Get()->GetCryptohomeLibrary();
-    cryptohomed->AsyncSetOwnerUser(
-        UserCrosSettingsProvider::cached_owner(), NULL);
+  CryptohomeLibrary* cryptohomed = CrosLibrary::Get()->GetCryptohomeLibrary();
+  cryptohomed->AsyncSetOwnerUser(
+      UserCrosSettingsProvider::cached_owner(), NULL);
 
-    // Do not invoke AsyncDoAutomaticFreeDiskSpaceControl(NULL) here
-    // so it does not delay the following mount. Cleanup will be
-    // started in Cryptohomed by timer.
-  }
+  // Do not invoke AsyncDoAutomaticFreeDiskSpaceControl(NULL) here
+  // so it does not delay the following mount. Cleanup will be
+  // started in Cryptohomed by timer.
 }
 
 }  // namespace chromeos