Eliminate CrosLibrary::EnsureLoaded

chrome/browser/chromeos/user_cros_settings_provider.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/chromeos/user_cros_settings_provider.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 329 matching lines @@
 
   UserCrosSettingsTrust()
       : ownership_service_(OwnershipService::GetSharedInstance()),
         retries_left_(kNumRetriesLimit) {
     migration_helper_.set_callback(this);
     // Start prefetching Boolean and String preferences.
     Reload();
   }
 
   virtual ~UserCrosSettingsTrust() {
-    if (BrowserThread::CurrentlyOn(BrowserThread::UI) &&
-        CrosLibrary::Get()->EnsureLoaded()) {
+    if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
       // Cancels all pending callbacks from us.
       SignedSettingsHelper::Get()->CancelCallback(this);
     }
   }
 
   // Called right before boolean property is changed.
   void OnBooleanPropertyChange(const std::string& path, bool new_value) {
     if (path == kSignedDataRoamingEnabled) {
-      if (!CrosLibrary::Get()->EnsureLoaded())
-        return;
-
       NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
       if (cros->IsCellularAlwaysInRoaming()) {
         // If operator requires roaming always enabled, ignore supplied value
         // and set data roaming allowed in true always.
         new_value = true;
       }
       cros->SetCellularDataRoamingAllowed(new_value);
     } else if (path == kStatsReportingPref) {
       // TODO(pastarmovj): Remove this once we don't need to regenerate the
       // consent file for the GUID anymore.
       OptionsUtil::ResolveMetricsReportingEnabled(new_value);
     }
   }
 
   // Called right after signed value was checked.
   void OnBooleanPropertyRetrieve(const std::string& path,
                                  bool value,
                                  UseValue use_value) {
     if (path == kSignedDataRoamingEnabled) {
-      if (!CrosLibrary::Get()->EnsureLoaded())
-        return;
-
       NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
       const NetworkDevice* cellular = cros->FindCellularDevice();
       if (cellular) {
         bool device_value = cellular->data_roaming_allowed();
         if (!device_value && cros->IsCellularAlwaysInRoaming()) {
           // If operator requires roaming always enabled, ignore supplied value
           // and set data roaming allowed in true always.
           cros->SetCellularDataRoamingAllowed(true);
         } else {
           bool new_value = (use_value == USE_VALUE_SUPPLIED) ? value : false;
@@ skipping 28 matching lines @@
   }
 
   void StartFetchingSetting(const std::string& name) {
     DCHECK(g_browser_process);
     PrefService* prefs = g_browser_process->local_state();
     if (!prefs)
       return;
     // Do not trust before fetching complete.
     prefs->ClearPref((name + kTrustedSuffix).c_str());
     prefs->ScheduleSavePersistentPrefs();
-    if (CrosLibrary::Get()->EnsureLoaded()) {
-      SignedSettingsHelper::Get()->StartRetrieveProperty(name, this);
-    }
+    SignedSettingsHelper::Get()->StartRetrieveProperty(name, this);
   }
 
   // Implementation of SignedSettingsHelper::Callback.
   virtual void OnRetrievePropertyCompleted(SignedSettings::ReturnCode code,
                                            const std::string& name,
                                            const std::string& value) {
     if (!IsControlledBooleanSetting(name) && !IsControlledStringSetting(name)) {
       NOTREACHED();
       return;
     }
@@ skipping 303 matching lines @@
   if (cached_whitelist_update->Remove(email_value, NULL))
     prefs->ScheduleSavePersistentPrefs();
 }
 
 // static
 void UserCrosSettingsProvider::UpdateCachedOwner(const std::string& email) {
   UpdateCacheString(kDeviceOwner, email, USE_VALUE_SUPPLIED);
 }
 
 }  // namespace chromeos