PART1: Initiated the SignedSettings refactoring.

chrome/browser/chromeos/cros/network_library.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/cros/network_library.h"
 
 #include <algorithm>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-gtype-specialized.h>
 #include <glib-object.h>
 #include <map>
 #include <set>
 
 #include "base/bind.h"
 #include "base/i18n/icu_encoding_detection.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/i18n/time_formatting.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/utf_string_conversion_utils.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/native_network_constants.h"
 #include "chrome/browser/chromeos/cros/native_network_parser.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/network_login_observer.h"
-#include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/common/time_format.h"
 #include "content/browser/browser_thread.h"
 #include "crypto/nss_util.h"  // crypto::GetTPMTokenInfo() for 802.1X and VPN.
 #include "grit/generated_resources.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/text/bytes_formatting.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // Implementation notes.
@@ skipping 3468 matching lines @@
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   NetworkDevice* device = FindNetworkDeviceByPath(path);
   if (device) {
     VLOG(2) << "UpdateNetworkDeviceStatus: " << device->name() << "." << key;
     PropertyIndex index = PROPERTY_INDEX_UNKNOWN;
     if (device->UpdateStatus(key, value, &index)) {
       if (index == PROPERTY_INDEX_CELLULAR_ALLOW_ROAMING) {
         if (!device->data_roaming_allowed() && IsCellularAlwaysInRoaming()) {
           SetCellularDataRoamingAllowed(true);
         } else {
-          bool settings_value =
-              UserCrosSettingsProvider::cached_data_roaming_enabled();
-          if (device->data_roaming_allowed() != settings_value) {
+          bool settings_value;
+          if (CrosSettings::Get()->GetBoolean(
+                  kSignedDataRoamingEnabled, &settings_value) &&
+              device->data_roaming_allowed() != settings_value) {
             // Switch back to signed settings value.
             SetCellularDataRoamingAllowed(settings_value);
             return;
           }
         }
       }
     } else {
       VLOG(1) << "UpdateNetworkDeviceStatus: Failed to update: "
               << path << "." << key;
     }
@@ skipping 1051 matching lines @@
     if (device) {
       device_map_[device_path] = device;
     }
     CHECK(device) << "Attempted to add NULL device for path: " << device_path;
   }
   VLOG(1) << "ParseNetworkDevice:" << device->name();
   if (device && device->type() == TYPE_CELLULAR) {
     if (!device->data_roaming_allowed() && IsCellularAlwaysInRoaming()) {
       SetCellularDataRoamingAllowed(true);
     } else {
-      bool settings_value =
-          UserCrosSettingsProvider::cached_data_roaming_enabled();
-      if (device->data_roaming_allowed() != settings_value) {
+      bool settings_value;
+      if (CrosSettings::Get()->GetBoolean(
+              kSignedDataRoamingEnabled, &settings_value) &&
+          device->data_roaming_allowed() != settings_value) {
         // Switch back to signed settings value.
         SetCellularDataRoamingAllowed(settings_value);
       }
     }
   }
   NotifyNetworkManagerChanged(false);  // Not forced.
   AddNetworkDeviceObserver(device_path, network_device_observer_.get());
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ skipping 469 matching lines @@
   return impl;
 }
 
 /////////////////////////////////////////////////////////////////////////////
 
 }  // namespace chromeos
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until its last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::NetworkLibraryImplBase);