Eliminate CrosLibrary::EnsureLoaded

chrome/browser/ui/browser_list.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/ui/browser_list.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "build/build_config.h"
@@ skipping 17 matching lines @@
 #if defined(OS_MACOSX)
 #include "chrome/browser/chrome_browser_application_mac.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #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
 #endif
 
 namespace {
 
 // This object is instantiated when the first Browser object is added to the
 // list and delete when the last one is removed. It watches for loads and
 // creates histograms of some global object counts.
@@ skipping 188 matching lines @@
 
 #if defined(OS_CHROMEOS)
 
 // Whether a session manager requested to shutdown.
 bool g_session_manager_requested_shutdown = true;
 
 // Fast shutdown for ChromeOS. It tells session manager to start
 // 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;
   }
   return false;
 }
 
 void NotifyWindowManagerAboutSignout() {
 #if defined(TOOLKIT_USES_GTK)
   static bool notified = false;
@@ skipping 67 matching lines @@
   if (notified || g_session_manager_requested_shutdown)
     return;
   notified = true;
 #endif
 
   if (fast_path)
     NotifyAppTerminating();
 
 #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();
     } else {
       chromeos::DBusThreadManager::Get()->GetSessionManagerClient()
           ->StopSession();
     }
     return;
   }
   // If running the Chrome OS build, but we're not on the device, fall through
@@ skipping 508 matching lines @@
   // If no more TabContents from Browsers, check the BackgroundPrintingManager.
   while (bg_printing_iterator_ != GetBackgroundPrintingManager()->end()) {
     cur_ = *bg_printing_iterator_;
     CHECK(cur_);
     ++bg_printing_iterator_;
     return;
   }
   // Reached the end - no more TabContents.
   cur_ = NULL;
 }