Eliminate CrosLibrary::EnsureLoaded

BUG=chromium-os:19886
TEST=All chromeos tests compile and run.

Review URL: http://codereview.chromium.org/8588006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110516 0039d316-1c4b-4281-b951-d872f2087c98

28 files changed, 55 insertions, 184 deletions

diff --git a/chrome/browser/automation/automation_provider_observers_chromeos.cc b/chrome/browser/automation/automation_provider_observers_chromeos.cc
index e78fc91..6ba3ad6 100644
--- a/chrome/browser/automation/automation_provider_observers_chromeos.cc
+++ b/chrome/browser/automation/automation_provider_observers_chromeos.cc
@@ -28,7 +28,7 @@ NetworkManagerInitObserver::~NetworkManagerInitObserver() {
 }
 
 bool NetworkManagerInitObserver::Init() {
-  if (!CrosLibrary::Get()->EnsureLoaded()) {
+  if (!CrosLibrary::Get()->libcros_loaded()) {
     // If cros library fails to load, don't wait for the network
     // library to finish initializing, because it'll wait forever.
     automation_->OnNetworkLibraryInit();
diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc
index 3f0cd4a..1af8e16 100644
--- a/chrome/browser/automation/testing_automation_provider_chromeos.cc
+++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc
@@ -48,16 +48,6 @@ using chromeos::UserManager;
 
 namespace {
 
-bool EnsureCrosLibraryLoaded(AutomationProvider* provider,
-                             IPC::Message* reply_message) {
-  if (!CrosLibrary::Get()->EnsureLoaded()) {
-    AutomationJSONReply(provider, reply_message).SendError(
-        "Could not load cros library.");
-    return false;
-  }
-  return true;
-}
-
 DictionaryValue* GetNetworkInfoDict(const chromeos::Network* network) {
   DictionaryValue* item = new DictionaryValue;
   item->SetString("name", network->name());
@@ -283,9 +273,6 @@ void TestingAutomationProvider::Login(DictionaryValue* args,
 
 void TestingAutomationProvider::LockScreen(DictionaryValue* args,
                                            IPC::Message* reply_message) {
-  if (!EnsureCrosLibraryLoaded(this, reply_message))
-    return;
-
   new ScreenLockUnlockObserver(this, reply_message, true);
   CrosLibrary::Get()->GetScreenLockLibrary()->
       NotifyScreenLockRequested();
@@ -334,9 +321,6 @@ void TestingAutomationProvider::SignoutInScreenLocker(
 
 void TestingAutomationProvider::GetBatteryInfo(DictionaryValue* args,
                                                IPC::Message* reply_message) {
-  if (!EnsureCrosLibraryLoaded(this, reply_message))
-    return;
-
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
 
   return_value->SetBoolean("battery_is_present",
@@ -363,9 +347,6 @@ void TestingAutomationProvider::GetBatteryInfo(DictionaryValue* args,
 
 void TestingAutomationProvider::GetNetworkInfo(DictionaryValue* args,
                                                IPC::Message* reply_message) {
-  if (!EnsureCrosLibraryLoaded(this, reply_message))
-    return;
-
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
 
@@ -469,9 +450,6 @@ void TestingAutomationProvider::GetNetworkInfo(DictionaryValue* args,
 
 void TestingAutomationProvider::NetworkScan(DictionaryValue* args,
                                             IPC::Message* reply_message) {
-  if (!EnsureCrosLibraryLoaded(this, reply_message))
-    return;
-
   NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
   network_library->RequestNetworkScan();
 
@@ -481,9 +459,6 @@ void TestingAutomationProvider::NetworkScan(DictionaryValue* args,
 
 void TestingAutomationProvider::ToggleNetworkDevice(
     DictionaryValue* args, IPC::Message* reply_message) {
-  if (!EnsureCrosLibraryLoaded(this, reply_message))
-    return;
-
   AutomationJSONReply reply(this, reply_message);
   std::string device;
   bool enable;
@@ -551,9 +526,6 @@ void TestingAutomationProvider::SetProxySettings(Browser* browser,
 
 void TestingAutomationProvider::ConnectToCellularNetwork(
     DictionaryValue* args, IPC::Message* reply_message) {
-  if (!EnsureCrosLibraryLoaded(this, reply_message))
-    return;
-
   std::string service_path;
   if (!args->GetString("service_path", &service_path)) {
     AutomationJSONReply(this, reply_message).SendError(
@@ -579,9 +551,6 @@ void TestingAutomationProvider::ConnectToCellularNetwork(
 
 void TestingAutomationProvider::DisconnectFromCellularNetwork(
     DictionaryValue* args, IPC::Message* reply_message) {
-  if (!EnsureCrosLibraryLoaded(this, reply_message))
-    return;
-
   NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
   const chromeos::CellularNetwork* cellular =
         network_library->cellular_network();
@@ -599,9 +568,6 @@ void TestingAutomationProvider::DisconnectFromCellularNetwork(
 
 void TestingAutomationProvider::ConnectToWifiNetwork(
     DictionaryValue* args, IPC::Message* reply_message) {
-  if (!EnsureCrosLibraryLoaded(this, reply_message))
-    return;
-
   AutomationJSONReply reply(this, reply_message);
   std::string service_path, password;
   bool shared;
@@ -636,8 +602,6 @@ void TestingAutomationProvider::ConnectToWifiNetwork(
 
 void TestingAutomationProvider::ForgetWifiNetwork(
     DictionaryValue* args, IPC::Message* reply_message) {
-  if (!EnsureCrosLibraryLoaded(this, reply_message))
-    return;
   std::string service_path;
   if (!args->GetString("service_path", &service_path)) {
     AutomationJSONReply(this, reply_message).SendError(
@@ -651,9 +615,6 @@ void TestingAutomationProvider::ForgetWifiNetwork(
 
 void TestingAutomationProvider::ConnectToHiddenWifiNetwork(
     DictionaryValue* args, IPC::Message* reply_message) {
-  if (!EnsureCrosLibraryLoaded(this, reply_message))
-    return;
-
   std::string ssid, security, password;
   bool shared;
   if (!args->GetString("ssid", &ssid) ||
@@ -747,9 +708,6 @@ void TestingAutomationProvider::ConnectToHiddenWifiNetwork(
 
 void TestingAutomationProvider::DisconnectFromWifiNetwork(
     DictionaryValue* args, IPC::Message* reply_message) {
-  if (!EnsureCrosLibraryLoaded(this, reply_message))
-    return;
-
   AutomationJSONReply reply(this, reply_message);
   NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
   const chromeos::WifiNetwork* wifi = network_library->wifi_network();
@@ -764,9 +722,6 @@ void TestingAutomationProvider::DisconnectFromWifiNetwork(
 
 void TestingAutomationProvider::AddPrivateNetwork(
     DictionaryValue* args, IPC::Message* reply_message) {
-  if (!EnsureCrosLibraryLoaded(this, reply_message))
-    return;
-
   std::string hostname, service_name, provider_type, key, cert_id, cert_nss,
       username, password;
   if (!args->GetString("hostname", &hostname) ||
@@ -845,9 +800,6 @@ void TestingAutomationProvider::AddPrivateNetwork(
 
 void TestingAutomationProvider::ConnectToPrivateNetwork(
     DictionaryValue* args, IPC::Message* reply_message) {
-  if (!EnsureCrosLibraryLoaded(this, reply_message))
-    return;
-
   AutomationJSONReply reply(this, reply_message);
   std::string service_path;
   if (!args->GetString("service_path", &service_path)) {
@@ -877,9 +829,6 @@ void TestingAutomationProvider::ConnectToPrivateNetwork(
 
 void TestingAutomationProvider::GetPrivateNetworkInfo(
     DictionaryValue* args, IPC::Message* reply_message) {
-  if (!EnsureCrosLibraryLoaded(this, reply_message))
-    return;
-
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
   const chromeos::VirtualNetworkVector& virtual_networks =
@@ -911,9 +860,6 @@ void TestingAutomationProvider::GetPrivateNetworkInfo(
 
 void TestingAutomationProvider::DisconnectFromPrivateNetwork(
     DictionaryValue* args, IPC::Message* reply_message) {
-  if (!EnsureCrosLibraryLoaded(this, reply_message))
-    return;
-
   AutomationJSONReply reply(this, reply_message);
   NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
   const chromeos::VirtualNetwork* virt = network_library->virtual_network();
@@ -1106,9 +1052,6 @@ void TestingAutomationProvider::SetTimezone(DictionaryValue* args,
 
 void TestingAutomationProvider::GetUpdateInfo(DictionaryValue* args,
                                               IPC::Message* reply_message) {
-  if (!EnsureCrosLibraryLoaded(this, reply_message))
-    return;
-
   UpdateLibrary* update_library = CrosLibrary::Get()->GetUpdateLibrary();
   AutomationJSONReply* reply = new AutomationJSONReply(this, reply_message);
   update_library->GetReleaseTrack(GetReleaseTrackCallback, reply);
@@ -1117,9 +1060,6 @@ void TestingAutomationProvider::GetUpdateInfo(DictionaryValue* args,
 void TestingAutomationProvider::UpdateCheck(
     DictionaryValue* args,
     IPC::Message* reply_message) {
-  if (!EnsureCrosLibraryLoaded(this, reply_message))
-    return;
-
   UpdateLibrary* update_library = CrosLibrary::Get()->GetUpdateLibrary();
   AutomationJSONReply* reply = new AutomationJSONReply(this, reply_message);
   update_library->RequestUpdateCheck(UpdateCheckCallback, reply);
@@ -1127,9 +1067,6 @@ void TestingAutomationProvider::UpdateCheck(
 
 void TestingAutomationProvider::SetReleaseTrack(DictionaryValue* args,
                                                 IPC::Message* reply_message) {
-  if (!EnsureCrosLibraryLoaded(this, reply_message))
-    return;
-
   AutomationJSONReply reply(this, reply_message);
   std::string track;
   if (!args->GetString("track", &track)) {
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 85bd493..ab2b807 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -230,7 +230,7 @@ void HandleTestParameters(const CommandLine& command_line) {
   // and 1 if it can't be. This is for validation that the library is installed
   // and versioned properly for Chrome to find.
   if (command_line.HasSwitch(switches::kTestLoadLibcros))
-    exit(!chromeos::CrosLibrary::Get()->EnsureLoaded());
+    exit(!chromeos::CrosLibrary::Get()->libcros_loaded());
 #endif
 }
 
diff --git a/chrome/browser/chromeos/cros/cros_library.h b/chrome/browser/chromeos/cros/cros_library.h
index f95eacad..764c143 100644
--- a/chrome/browser/chromeos/cros/cros_library.h
+++ b/chrome/browser/chromeos/cros/cros_library.h
@@ -79,11 +79,6 @@ class CrosLibrary {
   // Getter for Test API that gives access to internal members of this class.
   TestApi* GetTestApi();
 
-  // TODO(stevenjb): Deprecate this. Libraries should fall back to stub
-  // implementations if libcros_loaded() is false, and/or use libcros_loaded()
-  // to protect calls to libcros. http://crosbug.com/19886
-  bool EnsureLoaded() { return use_stub_impl_ || libcros_loaded_; }
-
   bool libcros_loaded() { return libcros_loaded_; }
 
   // Returns an unlocalized string describing the last load error (if any).
diff --git a/chrome/browser/chromeos/login/base_login_display_host.cc b/chrome/browser/chromeos/login/base_login_display_host.cc
index eb5825a..2846fb5 100644
--- a/chrome/browser/chromeos/login/base_login_display_host.cc
+++ b/chrome/browser/chromeos/login/base_login_display_host.cc
@@ -247,7 +247,7 @@ void ShowLoginWizard(const std::string& first_screen_name,
   chromeos::LoginDisplayHost* display_host;
   display_host = new chromeos::WebUILoginDisplayHost(screen_bounds);
 
-  if (show_login_screen && chromeos::CrosLibrary::Get()->EnsureLoaded()) {
+  if (show_login_screen) {
     // R11 > R12 migration fix. See http://crosbug.com/p/4898.
     // If user has manually changed locale during R11 OOBE, locale will be set.
     // On R12 > R12|R13 etc. this fix won't get activated since
diff --git a/chrome/browser/chromeos/login/cryptohome_op.cc b/chrome/browser/chromeos/login/cryptohome_op.cc
index b2898bc..fe57b44 100644
--- a/chrome/browser/chromeos/login/cryptohome_op.cc
+++ b/chrome/browser/chromeos/login/cryptohome_op.cc
@@ -22,7 +22,6 @@ CryptohomeOp::CryptohomeOp(AuthAttemptState* current_attempt,
                            AuthAttemptStateResolver* callback)
     : attempt_(current_attempt),
       resolver_(callback) {
-  CHECK(chromeos::CrosLibrary::Get()->EnsureLoaded());
 }
 
 CryptohomeOp::~CryptohomeOp() {}
diff --git a/chrome/browser/chromeos/login/eula_screen.cc b/chrome/browser/chromeos/login/eula_screen.cc
index d33a39a..f96d5ca 100644
--- a/chrome/browser/chromeos/login/eula_screen.cc
+++ b/chrome/browser/chromeos/login/eula_screen.cc
@@ -28,13 +28,8 @@ void EulaScreen::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();
 }
 
@@ -43,8 +38,7 @@ void EulaScreen::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 {
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index 616c195..60d2ea1 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -290,7 +290,7 @@ void ExistingUserController::OnLoginFailure(const LoginFailure& failure) {
   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)
@@ -586,15 +586,13 @@ void ExistingUserController::SetOwnerUserInCryptohome() {
     // Another attempt will be invoked after verification completion.
     return;
   }
-  if (CrosLibrary::Get()->EnsureLoaded()) {
-    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.
-  }
+  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.
 }
 
 }  // namespace chromeos
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index 09bd84b..9047f8fd 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -37,6 +37,7 @@
 #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"
@@ -640,7 +641,7 @@ void LoginUtilsImpl::PrepareProfile(
 
   VLOG(1) << "Completing login for " << username;
 
-  if (CrosLibrary::Get()->EnsureLoaded()) {
+  if (system::runtime_environment::IsRunningOnChromeOS()) {
     btl->AddLoginTimeMarker("StartSession-Start", false);
     DBusThreadManager::Get()->GetSessionManagerClient()->StartSession(
         username);
@@ -805,7 +806,7 @@ void LoginUtilsImpl::OnProfileCreated(Profile* user_profile, Status status) {
 
   // Own TPM device if, for any reason, it has not been done in EULA
   // wizard screen.
-  if (CrosLibrary::Get()->EnsureLoaded()) {
+  if (system::runtime_environment::IsRunningOnChromeOS()) {
     CryptohomeLibrary* cryptohome = CrosLibrary::Get()->GetCryptohomeLibrary();
     btl->AddLoginTimeMarker("TPMOwn-Start", false);
     if (cryptohome->TpmIsEnabled() && !cryptohome->TpmIsBeingOwned()) {
@@ -923,7 +924,7 @@ void LoginUtilsImpl::CompleteOffTheRecordLogin(const GURL& start_url) {
 
   UserManager::Get()->GuestUserLoggedIn();
 
-  if (CrosLibrary::Get()->EnsureLoaded()) {
+  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();
@@ -1098,7 +1099,7 @@ class WarmingObserver : public NetworkLibrary::NetworkManagerObserver {
 };
 
 void LoginUtilsImpl::PrewarmAuthentication() {
-  if (CrosLibrary::Get()->EnsureLoaded()) {
+  if (system::runtime_environment::IsRunningOnChromeOS()) {
     NetworkLibrary *network = CrosLibrary::Get()->GetNetworkLibrary();
     if (network->Connected()) {
       const int kConnectionsNeeded = 1;
diff --git a/chrome/browser/chromeos/login/network_screen.cc b/chrome/browser/chromeos/login/network_screen.cc
index 56bc94d..76523e1 100644
--- a/chrome/browser/chromeos/login/network_screen.cc
+++ b/chrome/browser/chromeos/login/network_screen.cc
@@ -71,10 +71,8 @@ void NetworkScreen::OnNetworkManagerChanged(NetworkLibrary* network_lib) {
 // NetworkScreen, public:
 
 void NetworkScreen::Refresh() {
-  if (CrosLibrary::Get()->EnsureLoaded()) {
-    SubscribeNetworkNotification();
-    OnNetworkManagerChanged(chromeos::CrosLibrary::Get()->GetNetworkLibrary());
-  }
+  SubscribeNetworkNotification();
+  OnNetworkManagerChanged(chromeos::CrosLibrary::Get()->GetNetworkLibrary());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/chromeos/login/online_attempt.cc b/chrome/browser/chromeos/login/online_attempt.cc
index 1e62b5a..dc17353 100644
--- a/chrome/browser/chromeos/login/online_attempt.cc
+++ b/chrome/browser/chromeos/login/online_attempt.cc
@@ -46,7 +46,6 @@ OnlineAttempt::OnlineAttempt(bool using_oauth,
       resolver_(callback),
       weak_factory_(this),
       try_again_(true) {
-  CHECK(chromeos::CrosLibrary::Get()->EnsureLoaded());
 }
 
 OnlineAttempt::~OnlineAttempt() {
diff --git a/chrome/browser/chromeos/login/parallel_authenticator.cc b/chrome/browser/chromeos/login/parallel_authenticator.cc
index b32fd1a..aabda60 100644
--- a/chrome/browser/chromeos/login/parallel_authenticator.cc
+++ b/chrome/browser/chromeos/login/parallel_authenticator.cc
@@ -99,7 +99,6 @@ ParallelAuthenticator::ParallelAuthenticator(LoginStatusConsumer* consumer)
               switches::kWebUILogin) &&
           !CommandLine::ForCurrentProcess()->HasSwitch(
                   switches::kSkipOAuthLogin)) {
-  CHECK(chromeos::CrosLibrary::Get()->EnsureLoaded());
   // If not already owned, this is a no-op.  If it is, this loads the owner's
   // public key off of disk.
   OwnershipService::GetSharedInstance()->StartLoadOwnerKeyAttempt();
diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc
index e728b90..6fc836e 100644
--- a/chrome/browser/chromeos/login/screen_locker.cc
+++ b/chrome/browser/chromeos/login/screen_locker.cc
@@ -70,8 +70,7 @@ class ScreenLockObserver : public chromeos::ScreenLockLibrary::Observer,
     if (type == chrome::NOTIFICATION_LOGIN_USER_CHANGED) {
       // Register Screen Lock after login screen to make sure
       // we don't show the screen lock on top of the login screen by accident.
-      if (chromeos::CrosLibrary::Get()->EnsureLoaded())
-        chromeos::CrosLibrary::Get()->GetScreenLockLibrary()->AddObserver(this);
+      chromeos::CrosLibrary::Get()->GetScreenLockLibrary()->AddObserver(this);
     }
   }
 
@@ -272,8 +271,7 @@ void ScreenLocker::OnLoginSuccess(
       service->SetPassphrase(password, false);
     }
   }
-  if (CrosLibrary::Get()->EnsureLoaded())
-    CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenUnlockRequested();
+  CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenUnlockRequested();
 
   if (login_status_consumer_)
     login_status_consumer_->OnLoginSuccess(username, password,
@@ -373,8 +371,7 @@ void ScreenLocker::Show() {
     // receive the response within timeout. Just send complete
     // signal.
     VLOG(1) << "Show: locker already exists. Just sending completion event.";
-    if (CrosLibrary::Get()->EnsureLoaded())
-      CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenLockCompleted();
+    CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenLockCompleted();
   }
 }
 
@@ -428,8 +425,7 @@ ScreenLocker::~ScreenLocker() {
       chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
       content::Source<ScreenLocker>(this),
       content::Details<bool>(&state));
-  if (CrosLibrary::Get()->EnsureLoaded())
-    CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenUnlockCompleted();
+  CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenUnlockCompleted();
 }
 
 void ScreenLocker::SetAuthenticator(Authenticator* authenticator) {
@@ -448,8 +444,7 @@ void ScreenLocker::ScreenLockReady() {
       chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
       content::Source<ScreenLocker>(this),
       content::Details<bool>(&state));
-  if (CrosLibrary::Get()->EnsureLoaded())
-    CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenLockCompleted();
+  CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenLockCompleted();
 }
 
 }  // namespace chromeos
diff --git a/chrome/browser/chromeos/login/signed_settings.cc b/chrome/browser/chromeos/login/signed_settings.cc
index 8b579ce..9f56391 100644
--- a/chrome/browser/chromeos/login/signed_settings.cc
+++ b/chrome/browser/chromeos/login/signed_settings.cc
@@ -334,7 +334,6 @@ CheckWhitelistOp::CheckWhitelistOp(const std::string& email,
 CheckWhitelistOp::~CheckWhitelistOp() {}
 
 void CheckWhitelistOp::Execute() {
-  CHECK(chromeos::CrosLibrary::Get()->EnsureLoaded());
   std::vector<uint8> sig;
   std::string email_to_check = email_;
   if (!service_->has_cached_policy()) {
@@ -655,7 +654,6 @@ RetrievePropertyOp::RetrievePropertyOp(const std::string& name,
 RetrievePropertyOp::~RetrievePropertyOp() {}
 
 void RetrievePropertyOp::Execute() {
-  CHECK(chromeos::CrosLibrary::Get()->EnsureLoaded());
   // TODO(dilmah): Fix the race:
   // At the moment when device becomes owned there is lapse of time after
   // device has been owned and before temp_storage settings are finally
diff --git a/chrome/browser/chromeos/login/update_screen.cc b/chrome/browser/chromeos/login/update_screen.cc
index 15e3894..1958ad3 100644
--- a/chrome/browser/chromeos/login/update_screen.cc
+++ b/chrome/browser/chromeos/login/update_screen.cc
@@ -184,15 +184,10 @@ void UpdateScreen::UpdateStatusChanged(const UpdateLibrary::Status& status) {
 }
 
 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() {
@@ -216,8 +211,7 @@ void UpdateScreen::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:
diff --git a/chrome/browser/chromeos/login/update_screen_browsertest.cc b/chrome/browser/chromeos/login/update_screen_browsertest.cc
index bcddbee..d933e1c 100644
--- a/chrome/browser/chromeos/login/update_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/update_screen_browsertest.cc
@@ -39,7 +39,6 @@ class UpdateScreenTest : public WizardInProcessBrowserTest {
     WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture();
     cros_mock_->InitStatusAreaMocks();
     cros_mock_->SetStatusAreaMocksExpectations();
-    ASSERT_TRUE(CrosLibrary::Get()->EnsureLoaded());
 
     MockSessionManagerClient* mock_session_manager_client
         = mock_dbus_thread_manager->mock_session_manager_client();
diff --git a/chrome/browser/chromeos/login/user_manager.cc b/chrome/browser/chromeos/login/user_manager.cc
index eb99e69..29294d5 100644
--- a/chrome/browser/chromeos/login/user_manager.cc
+++ b/chrome/browser/chromeos/login/user_manager.cc
@@ -129,10 +129,7 @@ class RemoveAttempt : public CryptohomeLibrary::Delegate {
   }
 
   void RemoveUserCryptohome() {
-    if (CrosLibrary::Get()->EnsureLoaded()) {
-      CrosLibrary::Get()->GetCryptohomeLibrary()->AsyncRemove(user_email_,
-                                                              this);
-    }
+    CrosLibrary::Get()->GetCryptohomeLibrary()->AsyncRemove(user_email_, this);
   }
 
   void OnComplete(bool success, int return_code) {
diff --git a/chrome/browser/chromeos/login/version_info_updater.cc b/chrome/browser/chromeos/login/version_info_updater.cc
index 71c41cf..59300cc 100644
--- a/chrome/browser/chromeos/login/version_info_updater.cc
+++ b/chrome/browser/chromeos/login/version_info_updater.cc
@@ -15,6 +15,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/system/runtime_environment.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_version_info.h"
@@ -43,7 +44,7 @@ VersionInfoUpdater::~VersionInfoUpdater() {
 }
 
 void VersionInfoUpdater::StartUpdate(bool is_official_build) {
-  if (CrosLibrary::Get()->EnsureLoaded()) {
+  if (system::runtime_environment::IsRunningOnChromeOS()) {
     version_loader_.GetVersion(
         &version_consumer_,
         base::Bind(&VersionInfoUpdater::OnVersion, base::Unretained(this)),
@@ -78,7 +79,7 @@ void VersionInfoUpdater::StartUpdate(bool is_official_build) {
 }
 
 void VersionInfoUpdater::UpdateVersionLabel() {
-  if (!CrosLibrary::Get()->EnsureLoaded()) {
+  if (!system::runtime_environment::IsRunningOnChromeOS()) {
     if (delegate_) {
       delegate_->OnOSVersionLabelTextUpdated(
           CrosLibrary::Get()->load_error_string());
diff --git a/chrome/browser/chromeos/sms_observer.cc b/chrome/browser/chromeos/sms_observer.cc
index 3bbb4b1..f3dd5c6 100644
--- a/chrome/browser/chromeos/sms_observer.cc
+++ b/chrome/browser/chromeos/sms_observer.cc
@@ -18,9 +18,6 @@ namespace chromeos {
 SmsObserver::SmsObserver(Profile* profile)
     : profile_(profile) {
   DCHECK(profile_);
-  if (!CrosLibrary::Get()->EnsureLoaded())
-    return;
-
   UpdateObservers(chromeos::CrosLibrary::Get()->GetNetworkLibrary());
 }
 
@@ -31,8 +28,8 @@ SmsObserver::~SmsObserver() {
 }
 
 void SmsObserver::UpdateObservers(NetworkLibrary* library) {
-  if (!CrosLibrary::Get()->EnsureLoaded() ||
-      !CrosLibrary::Get()->GetNetworkLibrary()->IsCros())
+  // Guard against calls to libcros (http://crosbug.com/17863).
+  if (!CrosLibrary::Get()->libcros_loaded())
     return;
 
   const CellularNetworkVector& networks = library->cellular_networks();
@@ -78,8 +75,8 @@ void SmsObserver::UpdateObservers(NetworkLibrary* library) {
 }
 
 void SmsObserver::DisconnectAll() {
-  if (!CrosLibrary::Get()->EnsureLoaded() ||
-      !CrosLibrary::Get()->GetNetworkLibrary()->IsCros())
+  // Guard against calls to libcros (http://crosbug.com/17863).
+  if (!CrosLibrary::Get()->libcros_loaded())
     return;
 
   for (ObserversMap::iterator it = observers_.begin();
diff --git a/chrome/browser/chromeos/user_cros_settings_provider.cc b/chrome/browser/chromeos/user_cros_settings_provider.cc
index 309ca6d..d5313ba 100644
--- a/chrome/browser/chromeos/user_cros_settings_provider.cc
+++ b/chrome/browser/chromeos/user_cros_settings_provider.cc
@@ -347,8 +347,7 @@ class UserCrosSettingsTrust : public SignedSettingsHelper::Callback {
   }
 
   virtual ~UserCrosSettingsTrust() {
-    if (BrowserThread::CurrentlyOn(BrowserThread::UI) &&
-        CrosLibrary::Get()->EnsureLoaded()) {
+    if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
       // Cancels all pending callbacks from us.
       SignedSettingsHelper::Get()->CancelCallback(this);
     }
@@ -357,9 +356,6 @@ class UserCrosSettingsTrust : public SignedSettingsHelper::Callback {
   // Called right before boolean property is changed.
   void OnBooleanPropertyChange(const std::string& path, bool new_value) {
     if (path == kSignedDataRoamingEnabled) {
-      if (!CrosLibrary::Get()->EnsureLoaded())
-        return;
-
       NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
       if (cros->IsCellularAlwaysInRoaming()) {
         // If operator requires roaming always enabled, ignore supplied value
@@ -379,9 +375,6 @@ class UserCrosSettingsTrust : public SignedSettingsHelper::Callback {
                                  bool value,
                                  UseValue use_value) {
     if (path == kSignedDataRoamingEnabled) {
-      if (!CrosLibrary::Get()->EnsureLoaded())
-        return;
-
       NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
       const NetworkDevice* cellular = cros->FindCellularDevice();
       if (cellular) {
@@ -430,9 +423,7 @@ class UserCrosSettingsTrust : public SignedSettingsHelper::Callback {
     // Do not trust before fetching complete.
     prefs->ClearPref((name + kTrustedSuffix).c_str());
     prefs->ScheduleSavePersistentPrefs();
-    if (CrosLibrary::Get()->EnsureLoaded()) {
-      SignedSettingsHelper::Get()->StartRetrieveProperty(name, this);
-    }
+    SignedSettingsHelper::Get()->StartRetrieveProperty(name, this);
   }
 
   // Implementation of SignedSettingsHelper::Callback.
diff --git a/chrome/browser/extensions/extension_info_private_api_chromeos.cc b/chrome/browser/extensions/extension_info_private_api_chromeos.cc
index edeb3ad..8224784 100644
--- a/chrome/browser/extensions/extension_info_private_api_chromeos.cc
+++ b/chrome/browser/extensions/extension_info_private_api_chromeos.cc
@@ -59,12 +59,8 @@ bool GetChromeosInfoFunction::GetValue(const std::string& property_name,
         chromeos::system::StatisticsProvider::GetInstance();
     provider->GetMachineStatistic(kHardwareClass, value);
   } else if (property_name == kPropertyHomeProvider) {
-    if (CrosLibrary::Get()->EnsureLoaded()) {
-      NetworkLibrary* netlib = CrosLibrary::Get()->GetNetworkLibrary();
-      (*value) = netlib->GetCellularHomeCarrierId();
-    } else {
-      LOG(ERROR) << "CrosLibrary can't be loaded.";
-    }
+    NetworkLibrary* netlib = CrosLibrary::Get()->GetNetworkLibrary();
+    (*value) = netlib->GetCellularHomeCarrierId();
   } else if (property_name == kPropertyInitialLocale) {
     *value = chromeos::WizardController::GetInitialLocale();
   } else {
diff --git a/chrome/browser/geolocation/wifi_data_provider_chromeos.cc b/chrome/browser/geolocation/wifi_data_provider_chromeos.cc
index 895eea9..9ef3c9f 100644
--- a/chrome/browser/geolocation/wifi_data_provider_chromeos.cc
+++ b/chrome/browser/geolocation/wifi_data_provider_chromeos.cc
@@ -127,8 +127,6 @@ WifiDataProviderCommon::WlanApiInterface*
     WifiDataProviderChromeOs::NewWlanApi() {
   chromeos::CrosLibrary* cros_lib = chromeos::CrosLibrary::Get();
   DCHECK(cros_lib);
-  if (!cros_lib->EnsureLoaded())
-    return NULL;
   return NewWlanApi(cros_lib->GetNetworkLibrary());
 }
 
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
index 58fb442..bd27f72 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -412,9 +412,8 @@ void BrowserPolicyConnector::InitializeDevicePolicy() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kEnableDevicePolicy)) {
     device_data_store_.reset(CloudPolicyDataStore::CreateForDevicePolicies());
-    chromeos::CryptohomeLibrary* cryptohome = NULL;
-    if (chromeos::CrosLibrary::Get()->EnsureLoaded())
-      cryptohome = chromeos::CrosLibrary::Get()->GetCryptohomeLibrary();
+    chromeos::CryptohomeLibrary* cryptohome =
+        chromeos::CrosLibrary::Get()->GetCryptohomeLibrary();
     install_attributes_.reset(new EnterpriseInstallAttributes(cryptohome));
     DevicePolicyCache* device_policy_cache =
         new DevicePolicyCache(device_data_store_.get(),
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index 9c058de..1f20d6e 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -423,8 +423,7 @@ void ProfileManager::Observe(
 #if defined(OS_CHROMEOS)
   if (type == chrome::NOTIFICATION_LOGIN_USER_CHANGED) {
     const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-    if (chromeos::CrosLibrary::Get()->EnsureLoaded() &&
-        !command_line.HasSwitch(switches::kTestType)) {
+    if (!command_line.HasSwitch(switches::kTestType)) {
       // If we don't have a mounted profile directory we're in trouble.
       // TODO(davemoore) Once we have better api this check should ensure that
       // our profile directory is the one that's mounted, and that it's mounted
diff --git a/chrome/browser/ui/browser_list.cc b/chrome/browser/ui/browser_list.cc
index 4ee5778..ea4f60d 100644
--- a/chrome/browser/ui/browser_list.cc
+++ b/chrome/browser/ui/browser_list.cc
@@ -35,6 +35,7 @@
 #include "chrome/browser/chromeos/cros/update_library.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
+#include "chrome/browser/chromeos/system/runtime_environment.h"
 #if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #endif
@@ -243,7 +244,7 @@ bool g_session_manager_requested_shutdown = true;
 // shutdown process when closing browser windows won't be canceled.
 // Returns true if fast shutdown is successfully started.
 bool FastShutdown() {
-  if (chromeos::CrosLibrary::Get()->EnsureLoaded()
+  if (chromeos::system::runtime_environment::IsRunningOnChromeOS()
       && AreAllBrowsersCloseable()) {
     BrowserList::NotifyAndTerminate(true);
     return true;
@@ -331,9 +332,9 @@ void BrowserList::NotifyAndTerminate(bool fast_path) {
 
 #if defined(OS_CHROMEOS)
   NotifyWindowManagerAboutSignout();
-  chromeos::CrosLibrary* cros_library = chromeos::CrosLibrary::Get();
-  if (cros_library->EnsureLoaded()) {
+  if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) {
     // If update has been installed, reboot, otherwise, sign out.
+    chromeos::CrosLibrary* cros_library = chromeos::CrosLibrary::Get();
     if (cros_library->GetUpdateLibrary()->status().status ==
           chromeos::UPDATE_STATUS_UPDATED_NEED_REBOOT) {
       cros_library->GetUpdateLibrary()->RebootAfterUpdate();
diff --git a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc
index cd73de7..7294f2c 100644
--- a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc
@@ -99,9 +99,6 @@ class ChooseMobileNetworkHandler
 
 ChooseMobileNetworkHandler::ChooseMobileNetworkHandler()
     : is_page_ready_(false), has_pending_results_(false) {
-  if (!CrosLibrary::Get()->EnsureLoaded())
-    return;
-
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   if (const NetworkDevice* cellular = cros->FindCellularDevice()) {
     device_path_ = cellular->device_path();
@@ -174,9 +171,6 @@ void ChooseMobileNetworkHandler::HandleCancel(const ListValue* args) {
     return;
   }
 
-  if (!CrosLibrary::Get()->EnsureLoaded())
-    return;
-
   // Switch to automatic mode.
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   cros->RequestCellularRegister(std::string());
@@ -191,9 +185,6 @@ void ChooseMobileNetworkHandler::HandleConnect(const ListValue* args) {
     return;
   }
 
-  if (!CrosLibrary::Get()->EnsureLoaded())
-    return;
-
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   cros->RequestCellularRegister(network_id);
 }
diff --git a/chrome/browser/ui/webui/chromeos/register_page_ui.cc b/chrome/browser/ui/webui/chromeos/register_page_ui.cc
index b6ad5fe..8bee89e 100644
--- a/chrome/browser/ui/webui/chromeos/register_page_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/register_page_ui.cc
@@ -18,6 +18,7 @@
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
+#include "chrome/browser/chromeos/system/runtime_environment.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/chromeos/version_loader.h"
 #include "chrome/browser/profiles/profile.h"
@@ -62,11 +63,6 @@ const char kUndefinedValue[] = "undefined";
 // Otherwise |kUndefinedValue| is returned.
 #if defined(OS_CHROMEOS)
 static std::string GetConnectionType() {
-  if (!chromeos::CrosLibrary::Get()->EnsureLoaded()) {
-    LOG(ERROR) << "CrosLibrary is not loaded.";
-    return kUndefinedValue;
-  }
-
   chromeos::NetworkLibrary* network_lib =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   if (network_lib->ethernet_connected())
@@ -237,13 +233,13 @@ void RegisterPageHandler::HandleGetRegistrationUrl(const ListValue* args) {
 
 void RegisterPageHandler::HandleGetUserInfo(const ListValue* args) {
 #if defined(OS_CHROMEOS)
-  if (chromeos::CrosLibrary::Get()->EnsureLoaded()) {
+  if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) {
      version_loader_.GetVersion(
          &version_consumer_,
          base::Bind(&RegisterPageHandler::OnVersion, base::Unretained(this)),
          chromeos::VersionLoader::VERSION_FULL);
   } else {
-    SkipRegistration("CrosLibrary is not loaded.");
+    SkipRegistration("Not running on ChromeOS.");
   }
 #endif
 }
diff --git a/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc b/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc
index 9bfe4f5..4cbb46c 100644
--- a/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc
@@ -290,9 +290,8 @@ void AboutPageHandler::SetReleaseTrack(const ListValue* args) {
 
 void AboutPageHandler::CheckNow(const ListValue* args) {
   // Make sure that libcros is loaded and OOBE is complete.
-  if (CrosLibrary::Get()->EnsureLoaded() &&
-      (!WizardController::default_controller() ||
-        WizardController::IsDeviceRegistered())) {
+  if (!WizardController::default_controller() ||
+      WizardController::IsDeviceRegistered()) {
     CrosLibrary::Get()->GetUpdateLibrary()->
         RequestUpdateCheck(NULL,   // no callback
                            NULL);  // no userdata