Added key-value storage for pending changes to OwnerSettingsServiceChromeOS.

chrome/browser/chromeos/settings/device_settings_provider.cc

Index: chrome/browser/chromeos/settings/device_settings_provider.cc
diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc
index b330639e01b76f54452cc23036c75d048a9c7636..7cb0c1631da58ced12aa20d2493799bfaff3878a 100644
--- a/chrome/browser/chromeos/settings/device_settings_provider.cc
+++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
@@ -587,11 +587,15 @@ void DeviceSettingsProvider::OnDeviceSettingsServiceShutdown() {
   device_settings_service_ = nullptr;
 }
 
-void DeviceSettingsProvider::OnTentativeChangesInPolicy(
-    const em::PolicyData& policy_data) {
-  em::ChromeDeviceSettingsProto device_settings;
-  CHECK(device_settings.ParseFromString(policy_data.policy_value()));
-  UpdateValuesCache(policy_data, device_settings, TEMPORARILY_UNTRUSTED);
+void DeviceSettingsProvider::OnTentativeChangeInSettings(
+    const std::string& setting,
+    const base::Value& value) {
+  em::ChromeDeviceSettingsProto settings = device_settings_;
+  OwnerSettingsServiceChromeOS::UpdateDeviceSettings(setting, value, settings);

[Mattias Nissler (ping if slow), 2014/11/10 11:31:20]

If you need to build a device settings blob here anyways, why not just keep the
OnTentativeChangesInPolicy() to take an em::PolicyData and construct it on the
OwnerSettingsService side?

[ygorshenin1, 2014/11/10 14:28:35]

Done.

+  em::PolicyData data;
+  data.set_username(device_settings_service_->GetUsername());
+  CHECK(settings.SerializeToString(data.mutable_policy_value()));
+  UpdateValuesCache(data, settings, TEMPORARILY_UNTRUSTED);
 }
 
 void DeviceSettingsProvider::RetrieveCachedData() {