Index: chrome/browser/chromeos/settings/device_settings_provider.h |
diff --git a/chrome/browser/chromeos/settings/device_settings_provider.h b/chrome/browser/chromeos/settings/device_settings_provider.h |
index 4705e6176feefe80faa47e6bff9697e0eeb56199..da256c0bf7bd26dd60503fc83a71d4df7e01d95a 100644 |
--- a/chrome/browser/chromeos/settings/device_settings_provider.h |
+++ b/chrome/browser/chromeos/settings/device_settings_provider.h |
@@ -52,6 +52,7 @@ class DeviceSettingsProvider |
const base::Value* Get(const std::string& path) const override; |
TrustedStatus PrepareTrustedValues(const base::Closure& callback) override; |
bool HandlesSetting(const std::string& path) const override; |
+ void SetPrefForTesting(const std::string& path, bool value); |
private: |
// CrosSettingsProvider implementation: |
@@ -77,19 +78,11 @@ class DeviceSettingsProvider |
const enterprise_management::ChromeDeviceSettingsProto& settings, |
TrustedStatus trusted_status); |
- // Applies the metrics policy and if not set migrates the legacy file. |
- void ApplyMetricsSetting(bool use_file, bool new_value); |
- |
// Applies the data roaming policy. |
void ApplyRoamingSetting(bool new_value); |
void ApplyRoamingSettingFromProto( |
const enterprise_management::ChromeDeviceSettingsProto& settings); |
- // Applies any changes of the policies that are not handled by the respective |
- // subsystems. |
- void ApplySideEffects( |
- const enterprise_management::ChromeDeviceSettingsProto& settings); |
- |
// In case of missing policy blob we should verify if this is upgrade of |
// machine owned from pre version 12 OS and the user never touched the device |
// settings. In this case revert to defaults and let people in until the owner |
@@ -109,11 +102,6 @@ class DeviceSettingsProvider |
// if new settings have been loaded. |
bool UpdateFromService(); |
- // Checks the current ownership status to see whether the device owner is |
- // logged in and writes the data accumulated in |migration_values_| to proper |
- // device settings. |
- void AttemptMigration(); |
- |
// Pending callbacks that need to be invoked after settings verification. |
std::vector<base::Closure> callbacks_; |