chromeos: Fix test failures in LoginUtils*

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 19 matching lines @@
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/login/background_view.h"
 #include "chrome/browser/chromeos/login/cookie_fetcher.h"
 #include "chrome/browser/chromeos/login/language_switch_menu.h"
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/ownership_service.h"
 #include "chrome/browser/chromeos/login/parallel_authenticator.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/chromeos/system/runtime_environment.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/net/gaia/gaia_oauth_consumer.h"
 #include "chrome/browser/net/gaia/gaia_oauth_fetcher.h"
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/net/preconnect.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 583 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 (system::runtime_environment::IsRunningOnChromeOS()) {
-    btl->AddLoginTimeMarker("StartSession-Start", false);
-    DBusThreadManager::Get()->GetSessionManagerClient()->StartSession(
-        username);
-    btl->AddLoginTimeMarker("StartSession-End", false);
-  }
+  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);
 
   // Switch log file as soon as possible.
   logging::RedirectChromeLogging(*(CommandLine::ForCurrentProcess()));
 
   username_ = username;
   password_ = password;
@@ skipping 139 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 (system::runtime_environment::IsRunningOnChromeOS()) {
-    CryptohomeLibrary* cryptohome = CrosLibrary::Get()->GetCryptohomeLibrary();
-    btl->AddLoginTimeMarker("TPMOwn-Start", false);
-    if (cryptohome->TpmIsEnabled() && !cryptohome->TpmIsBeingOwned()) {
-      if (cryptohome->TpmIsOwned()) {
-        cryptohome->TpmClearStoredPassword();
-      } else {
-        cryptohome->TpmCanAttemptOwnership();
-      }
+  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);
   }
+  btl->AddLoginTimeMarker("TPMOwn-End", false);
 
   user_profile->OnLogin();
 
   // TODO(altimofeev): This pointer should probably never be NULL, but it looks
   // like LoginUtilsImpl::OnProfileCreated() may be getting called before
   // LoginUtilsImpl::PrepareProfile() has set |delegate_| when Chrome is killed
   // during shutdown in tests -- see http://crosbug.com/18269.  Replace this
   // 'if' statement with a CHECK(delegate_) once the underlying issue is
   // resolved.
   if (delegate_)
@@ skipping 86 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 (system::runtime_environment::IsRunningOnChromeOS()) {
-    // Session Manager may kill the chrome anytime after this point.
-    // Write exit_cleanly and other stuff to the disk here.
-    g_browser_process->EndSession();
+  // 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,
-                                   browser_command_line,
-                                   &command_line);
+  // 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,
+                                 browser_command_line,
+                                 &command_line);
 
-    if (job_restart_request_) {
-      NOTREACHED();
-    }
-    VLOG(1) << "Requesting a restart with PID " << getpid()
-            << " and command line: " << cmd_line_str;
-    job_restart_request_ = new JobRestartRequest(getpid(), cmd_line_str);
+  if (job_restart_request_) {
+    NOTREACHED();
   }
+  VLOG(1) << "Requesting a restart with PID " << getpid()
+          << " and command line: " << cmd_line_str;
+  job_restart_request_ = new JobRestartRequest(getpid(), cmd_line_str);
 }
 
 std::string LoginUtilsImpl::GetOffTheRecordCommandLine(
     const GURL& start_url,
     const CommandLine& base_command_line,
     CommandLine* command_line) {
   static const char* kForwardSwitches[] = {
       switches::kEnableLogging,
       switches::kDisableAcceleratedPlugins,
       switches::kUseGL,
@@ skipping 134 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 (system::runtime_environment::IsRunningOnChromeOS()) {
-    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();
-    }
+  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();
   }
 }
 
 void LoginUtilsImpl::RestoreAuthenticationSession(const std::string& username,
                                                   Profile* user_profile) {
   username_ = username;
   KickStartAuthentication(user_profile);
 }
 
 void LoginUtilsImpl::KickStartAuthentication(Profile* user_profile) {
@@ skipping 192 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