Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/chromeos/settings/device_settings_provider.cc

 // Copyright (c) 2012 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/settings/device_settings_provider.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 665 matching lines @@
     UMA_HISTOGRAM_COUNTS("DeviceSettings.MetricsMigrated", 1);
   }
   VLOG(1) << "Metrics policy is being set to : " << new_value
           << "(use file : " << use_file << ")";
   // TODO(pastarmovj): Remove this once we don't need to regenerate the
   // consent file for the GUID anymore.
   OptionsUtil::ResolveMetricsReportingEnabled(new_value);
 }
 
 void DeviceSettingsProvider::ApplyRoamingSetting(bool new_value) {
+  if (!CrosLibrary::Get())
+    return;  // May not be initialized in tests.
   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 if (device_value != new_value) {
       cros->SetCellularDataRoamingAllowed(new_value);
@@ skipping 160 matching lines @@
 void DeviceSettingsProvider::AttemptMigration() {
   if (device_settings_service_->HasPrivateOwnerKey()) {
     PrefValueMap::const_iterator i;
     for (i = migration_values_.begin(); i != migration_values_.end(); ++i)
       DoSet(i->first, *i->second);
     migration_values_.Clear();
   }
 }
 
 }  // namespace chromeos