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 18fea4e96c165cf6800d52b32df9a6f08c46a80c..1593c0da95a7cc66c2100bb4a32abb3370023175 100644
--- a/chrome/browser/ui/browser_list.cc
+++ b/chrome/browser/ui/browser_list.cc
@@ -227,7 +227,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::CrosLibrary::Get()->libcros_loaded()

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

we don't need to call this, as it's also checked in
BrowserList::NotifyAndTerminate()

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

But it does affect the return value, so I didn't want to mess with it yet. Did
replace with system::runtime_environment::IsRunningOnChromeOS() though.

       && AreAllBrowsersCloseable()) {
     BrowserList::NotifyAndTerminate(true);
     return true;
@@ -319,7 +319,7 @@ void BrowserList::NotifyAndTerminate(bool fast_path) {
 #if defined(OS_CHROMEOS)
   NotifyWindowManagerAboutSignout();
   chromeos::CrosLibrary* cros_library = chromeos::CrosLibrary::Get();
-  if (cros_library->EnsureLoaded()) {
+  if (cros_library->libcros_loaded()) {

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

I think system::runtime_environment::IsRunningOnChromeOS() should be used
instead 

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

Done.

     // If update has been installed, reboot, otherwise, sign out.
     if (cros_library->GetUpdateLibrary()->status().status ==
           chromeos::UPDATE_STATUS_UPDATED_NEED_REBOOT) {