Eliminate CrosLibrary::EnsureLoaded

chrome/browser/ui/webui/chromeos/register_page_ui.cc

Index: chrome/browser/ui/webui/chromeos/register_page_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/register_page_ui.cc b/chrome/browser/ui/webui/chromeos/register_page_ui.cc
index b6ad5fedd17e4f17cd9dd98b25a79ca82ff36e18..3a7455cedc893f17b98f99598904768d157ea68f 100644
--- a/chrome/browser/ui/webui/chromeos/register_page_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/register_page_ui.cc
@@ -62,11 +62,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,7 +232,7 @@ void RegisterPageHandler::HandleGetRegistrationUrl(const ListValue* args) {
 
 void RegisterPageHandler::HandleGetUserInfo(const ListValue* args) {
 #if defined(OS_CHROMEOS)
-  if (chromeos::CrosLibrary::Get()->EnsureLoaded()) {
+  if (chromeos::CrosLibrary::Get()->libcros_loaded()) {

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

IsRunningOnChromeOS()?

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

Done.

      version_loader_.GetVersion(
          &version_consumer_,
          base::Bind(&RegisterPageHandler::OnVersion, base::Unretained(this)),