Eliminate CrosLibrary::EnsureLoaded

chrome/browser/automation/automation_provider_observers_chromeos.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/automation/automation_provider_observers.h"
 
 #include "base/values.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/authentication_notification_details.h"
@@ skipping 10 matching lines @@
 
 NetworkManagerInitObserver::NetworkManagerInitObserver(
     AutomationProvider* automation)
     : automation_(automation->AsWeakPtr()) {}
 
 NetworkManagerInitObserver::~NetworkManagerInitObserver() {
     CrosLibrary::Get()->GetNetworkLibrary()->RemoveNetworkManagerObserver(this);
 }
 
 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();
     return false;
   }
 
   CrosLibrary::Get()->GetNetworkLibrary()->AddNetworkManagerObserver(this);
   return true;
 }
 
@@ skipping 434 matching lines @@
   user_manager->AddObserver(this);
   user_manager->SaveUserImage(user.email(), photo);
 }
 
 void PhotoCaptureObserver::LocalStateChanged(
     chromeos::UserManager* user_manager) {
   user_manager->RemoveObserver(this);
   AutomationJSONReply(automation_, reply_message_.release()).SendSuccess(NULL);
   delete this;
 }