Index: chrome/browser/chromeos/cros/network_library.cc |
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc |
index 49401d8ed51befdc8d3259e547dc52f439a0a133..e90eb23590e29d80ca284d5d385a139e3f1e3971 100644 |
--- a/chrome/browser/chromeos/cros/network_library.cc |
+++ b/chrome/browser/chromeos/cros/network_library.cc |
@@ -27,13 +27,13 @@ |
#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/cros/onc_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. |
@@ -3558,9 +3558,10 @@ void NetworkLibraryImplCros::UpdateNetworkDeviceStatus( |
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; |
@@ -4639,9 +4640,10 @@ void NetworkLibraryImplCros::ParseNetworkDevice(const std::string& device_path, |
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); |
} |