Added key-value storage for pending changes to OwnerSettingsServiceChromeOS. This CL is an alternat…

chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_H_
 #define CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
+#include "base/containers/scoped_ptr_hash_map.h"
 #include "base/macros.h"
+#include "base/values.h"
 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/ownership/owner_key_util.h"
 #include "components/ownership/owner_settings_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class Profile;
@@ skipping 53 matching lines @@
       const std::string& user_id,
       const enterprise_management::PolicyData* policy_data,
       const enterprise_management::ChromeDeviceSettingsProto* settings);
 
   // Updates device |settings|.
   static void UpdateDeviceSettings(
       const std::string& path,
       const base::Value& value,
       enterprise_management::ChromeDeviceSettingsProto& settings);
 
-  bool has_pending_changes() const { return has_pending_changes_; }
+  bool has_pending_changes() const {
+    return !pending_changes_.empty() || tentative_settings_.get();
+  }
 
  private:
   friend class OwnerSettingsServiceChromeOSFactory;
 
   OwnerSettingsServiceChromeOS(
       DeviceSettingsService* device_settings_service,
       Profile* profile,
       const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util);
 
   // OwnerSettingsService protected interface overrides:
 
   // Reloads private key from profile's NSS slots, responds via |callback|.
   virtual void ReloadKeypairImpl(const base::Callback<
       void(const scoped_refptr<ownership::PublicKey>& public_key,
            const scoped_refptr<ownership::PrivateKey>& private_key)>& callback)
       override;
 
   // Possibly notifies DeviceSettingsService that owner's keypair is loaded.
   virtual void OnPostKeypairLoadedActions() override;
 
-  // Tries to sign store current device settings if there're pending
-  // changes in device settings and no active previous call to
-  // DeviceSettingsService::Store().
-  void StoreDeviceSettings();
+  // Tries to apply recent changes to device settings proto, sign it and store.
+  void StorePendingChanges();
 
   // Called when current device settings are successfully signed.
   // Sends signed settings for storage.
   void OnPolicyAssembledAndSigned(
       scoped_ptr<enterprise_management::PolicyFetchResponse> policy_response);
 
   // Called by DeviceSettingsService when modified and signed device
   // settings are stored. Notifies observers and tries to store device
   // settings again.
   void OnSignedPolicyStored(bool success);
 
-  // Fetches device settings from DeviceSettingsService and merges
-  // them with local device settings.
-  bool UpdateFromService();
-
   DeviceSettingsService* device_settings_service_;
 
   // Profile this service instance belongs to.
   Profile* profile_;
 
   // User ID this service instance belongs to.
   std::string user_id_;
 
   // Whether profile still needs to be initialized.
   bool waiting_for_profile_creation_;
 
   // Whether TPM token still needs to be initialized.
   bool waiting_for_tpm_token_;
 
-  // The device settings.  This may be different from the actual
-  // current device settings (which can be obtained from
-  // DeviceSettingsService) in case the device does not have an owner
-  // yet or there are pending changes that have not yet been written
-  // to session_manager.
-  enterprise_management::ChromeDeviceSettingsProto device_settings_;
+  // A set of pending changes to device settings.
+  base::ScopedPtrHashMap<std::string, base::Value> pending_changes_;
 
-  // True if some settings were changed but not stored.
-  bool has_pending_changes_;
+  // A protobuf containing pending changes to device settings.
+  scoped_ptr<enterprise_management::ChromeDeviceSettingsProto>
+      tentative_settings_;
 
   content::NotificationRegistrar registrar_;
 
   base::WeakPtrFactory<OwnerSettingsServiceChromeOS> weak_factory_;
 
   base::WeakPtrFactory<OwnerSettingsServiceChromeOS> store_settings_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OwnerSettingsServiceChromeOS);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_H_