Eliminate CrosLibrary::EnsureLoaded

chrome/browser/ui/browser_list.cc

Index: chrome/browser/ui/browser_list.cc
diff --git a/chrome/browser/ui/browser_list.cc b/chrome/browser/ui/browser_list.cc
index 4ee57786bb97b08b444e1a33acdbdcd922f3b2c4..ea4f60da5fa29dffce7e19ffaae8626d6a7093c0 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();