Eliminate CrosLibrary::EnsureLoaded

chrome/browser/automation/testing_automation_provider_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/testing_automation_provider.h"
 
 #include "base/command_line.h"
 #include "base/i18n/time_formatting.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
@@ skipping 32 matching lines @@
 
 using chromeos::CrosLibrary;
 using chromeos::NetworkLibrary;
 using chromeos::UpdateLibrary;
 using chromeos::UserManager;
 
 namespace {
 
 bool EnsureCrosLibraryLoaded(AutomationProvider* provider,
                              IPC::Message* reply_message) {
-  if (!CrosLibrary::Get()->EnsureLoaded()) {
+  if (!CrosLibrary::Get()->libcros_loaded()) {
     AutomationJSONReply(provider, reply_message).SendError(
         "Could not load cros library.");
     return false;
   }
   return true;

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

Can we remove the function? This is a wrapper around EnsureLoaded()

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

Yes, that looks safe to do.
Done.

 }
 
 DictionaryValue* GetNetworkInfoDict(const chromeos::Network* network) {
   DictionaryValue* item = new DictionaryValue;
   item->SetString("name", network->name());
   item->SetString("device_path", network->device_path());
   item->SetString("ip_address", network->ip_address());
   item->SetString("status", network->GetStateString());
   return item;
 }
@@ skipping 1135 matching lines @@
   views::Widget* window = browser::CreateViewsWindow(
       browser->window()->GetNativeHandle(), take_photo_dialog);
   window->SetAlwaysOnTop(true);
   window->Show();
 }
 
 void TestingAutomationProvider::PowerChanged(
     const chromeos::PowerSupplyStatus& status) {
   power_status = status;
 }