Eliminate CrosLibrary::EnsureLoaded

chrome/browser/extensions/extension_info_private_api_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/extensions/extension_info_private_api_chromeos.h"
 
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
@@ skipping 41 matching lines @@
 }
 
 bool GetChromeosInfoFunction::GetValue(const std::string& property_name,
                                        std::string* value) {
   value->clear();
   if (property_name == kPropertyHWID) {
     chromeos::system::StatisticsProvider* provider =
         chromeos::system::StatisticsProvider::GetInstance();
     provider->GetMachineStatistic(kHardwareClass, value);
   } else if (property_name == kPropertyHomeProvider) {
-    if (CrosLibrary::Get()->EnsureLoaded()) {
+    if (CrosLibrary::Get()->libcros_loaded()) {

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

looks unnecessary

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

Done.

       NetworkLibrary* netlib = CrosLibrary::Get()->GetNetworkLibrary();
       (*value) = netlib->GetCellularHomeCarrierId();
     } else {
       LOG(ERROR) << "CrosLibrary can't be loaded.";
     }
   } else if (property_name == kPropertyInitialLocale) {
     *value = chromeos::WizardController::GetInitialLocale();
   } else {
     LOG(ERROR) << "Unknown property request: " << property_name;
     return false;
   }
   return true;
 }