Eliminate CrosLibrary::EnsureLoaded

chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.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/webui/chromeos/choose_mobile_network_ui.h"
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 81 matching lines @@
   bool is_page_ready_;
   bool has_pending_results_;
 
   DISALLOW_COPY_AND_ASSIGN(ChooseMobileNetworkHandler);
 };
 
 // ChooseMobileNetworkHandler implementation.
 
 ChooseMobileNetworkHandler::ChooseMobileNetworkHandler()
     : is_page_ready_(false), has_pending_results_(false) {
-  if (!CrosLibrary::Get()->EnsureLoaded())
-    return;
-
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   if (const NetworkDevice* cellular = cros->FindCellularDevice()) {
     device_path_ = cellular->device_path();
     cros->AddNetworkDeviceObserver(device_path_, this);
   }
   cros->RequestCellularScan();
 }
 
 ChooseMobileNetworkHandler::~ChooseMobileNetworkHandler() {
   if (!device_path_.empty()) {
@@ skipping 52 matching lines @@
   }
 }
 
 void ChooseMobileNetworkHandler::HandleCancel(const ListValue* args) {
   const size_t kConnectParamCount = 0;
   if (args->GetSize() != kConnectParamCount) {
     NOTREACHED();
     return;
   }
 
-  if (!CrosLibrary::Get()->EnsureLoaded())
-    return;
-
   // Switch to automatic mode.
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   cros->RequestCellularRegister(std::string());
 }
 
 void ChooseMobileNetworkHandler::HandleConnect(const ListValue* args) {
   std::string network_id;
   const size_t kConnectParamCount = 1;
   if (args->GetSize() != kConnectParamCount ||
       !args->GetString(0, &network_id)) {
     NOTREACHED();
     return;
   }
 
-  if (!CrosLibrary::Get()->EnsureLoaded())
-    return;
-
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   cros->RequestCellularRegister(network_id);
 }
 
 void ChooseMobileNetworkHandler::HandlePageReady(const ListValue* args) {
   const size_t kConnectParamCount = 0;
   if (args->GetSize() != kConnectParamCount) {
     NOTREACHED();
     return;
   }
@@ skipping 12 matching lines @@
     : ChromeWebUI(contents) {
   ChooseMobileNetworkHandler* handler = new ChooseMobileNetworkHandler();
   AddMessageHandler((handler)->Attach(this));
   // Set up the "chrome://choose-mobile-network" source.
   Profile* profile = Profile::FromBrowserContext(contents->browser_context());
   profile->GetChromeURLDataManager()->AddDataSource(
       CreateChooseMobileNetworkUIHTMLSource());
 }
 
 }  // namespace chromeos