Added key-value storage for pending changes to OwnerSettingsServiceChromeOS.

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/logging.h"
@@ skipping 569 matching lines @@
 
 void DeviceSettingsProvider::DeviceSettingsUpdated() {
   if (!store_callback_factory_.HasWeakPtrs())
     UpdateAndProceedStoring();
 }
 
 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() {
   em::PolicyData policy_data;
   if (!device_settings_cache::Retrieve(&policy_data,
                                        g_browser_process->local_state()) ||
       !device_settings_.ParseFromString(policy_data.policy_value())) {
     VLOG(1) << "Can't retrieve temp store, possibly not created yet.";
   }
 
@@ skipping 210 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