Eliminate CrosLibrary::EnsureLoaded

chrome/browser/chromeos/login/login_utils.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/login_utils.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 622 matching lines @@
     const std::string& password,
     const GaiaAuthConsumer::ClientLoginResult& credentials,
     bool pending_requests,
     bool using_oauth,
     bool has_cookies,
     LoginUtils::Delegate* delegate) {
   BootTimesLoader* btl = BootTimesLoader::Get();
 
   VLOG(1) << "Completing login for " << username;
 
-  if (CrosLibrary::Get()->EnsureLoaded()) {
+  if (CrosLibrary::Get()->libcros_loaded()) {

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

IsRunningOnChrome() instead, or remove it?

The code inside the block doesn't seem to depend on libcros.

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

I'm not sure what might break with login / tests if we run this on linux, so
will use system::runtime_environment::IsRunningOnChromeOS() for now.

     btl->AddLoginTimeMarker("StartSession-Start", false);
     DBusThreadManager::Get()->GetSessionManagerClient()->StartSession(
         username);
     btl->AddLoginTimeMarker("StartSession-End", false);
   }
 
   btl->AddLoginTimeMarker("UserLoggedIn-Start", false);
   UserManager::Get()->UserLoggedIn(username);
   btl->AddLoginTimeMarker("UserLoggedIn-End", false);
 
@@ skipping 144 matching lines @@
   // Supply credentials for sync and others to use. Load tokens from disk.
   if (!using_oauth_) {
     // For existing users there's usually a pending online auth request.
     // Tokens will be fetched after it's is succeeded.
     if (!pending_requests_)
       StartSync(user_profile, credentials_);
   }
 
   // Own TPM device if, for any reason, it has not been done in EULA
   // wizard screen.
-  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.

     CryptohomeLibrary* cryptohome = CrosLibrary::Get()->GetCryptohomeLibrary();
     btl->AddLoginTimeMarker("TPMOwn-Start", false);
     if (cryptohome->TpmIsEnabled() && !cryptohome->TpmIsBeingOwned()) {
       if (cryptohome->TpmIsOwned()) {
         cryptohome->TpmClearStoredPassword();
       } else {
         cryptohome->TpmCanAttemptOwnership();
       }
     }
     btl->AddLoginTimeMarker("TPMOwn-End", false);
@@ skipping 97 matching lines @@
   // that input method preferences are synced, so users can use their
   // farovite input methods as soon as the preferences are synced.
   LanguageSwitchMenu::SwitchLanguage(pref_locale);
 }
 
 void LoginUtilsImpl::CompleteOffTheRecordLogin(const GURL& start_url) {
   VLOG(1) << "Completing incognito login";
 
   UserManager::Get()->GuestUserLoggedIn();
 
-  if (CrosLibrary::Get()->EnsureLoaded()) {
+  if (CrosLibrary::Get()->libcros_loaded()) {
     // Session Manager may kill the chrome anytime after this point.
     // Write exit_cleanly and other stuff to the disk here.
     g_browser_process->EndSession();
 
     // For guest session we ask session manager to restart Chrome with --bwsi
     // flag. We keep only some of the arguments of this process.
     const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
     CommandLine command_line(browser_command_line.GetProgram());
     std::string cmd_line_str =
         GetOffTheRecordCommandLine(start_url,
@@ skipping 154 matching lines @@
           GURL(GaiaUrls::GetInstance()->client_login_url()),
           chrome_browser_net::UrlInfo::EARLY_LOAD_MOTIVATED,
           kConnectionsNeeded);
       netlib->RemoveNetworkManagerObserver(this);
       delete this;
     }
   }
 };
 
 void LoginUtilsImpl::PrewarmAuthentication() {
-  if (CrosLibrary::Get()->EnsureLoaded()) {
+  if (CrosLibrary::Get()->libcros_loaded()) {
     NetworkLibrary *network = CrosLibrary::Get()->GetNetworkLibrary();
     if (network->Connected()) {
       const int kConnectionsNeeded = 1;
       chrome_browser_net::PreconnectOnUIThread(
           GURL(GaiaUrls::GetInstance()->client_login_url()),
           chrome_browser_net::UrlInfo::EARLY_LOAD_MOTIVATED,
           kConnectionsNeeded);
     } else {
       new WarmingObserver();
     }
@@ skipping 202 matching lines @@
   // Mark login host for deletion after browser starts.  This
   // guarantees that the message loop will be referenced by the
   // browser before it is dereferenced by the login host.
   if (login_host) {
     login_host->OnSessionStart();
     login_host = NULL;
   }
 }
 
 }  // namespace chromeos