Extension settings API: force through changes that come from sync (ignoring

chrome/browser/extensions/settings/settings_storage_cache.cc

 // Copyright (c) 2011 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/extensions/settings/settings_storage_cache.h"
 
 namespace extensions {
 
 SettingsStorageCache::SettingsStorageCache(
     SettingsStorage* delegate) : delegate_(delegate) {}
@@ skipping 49 matching lines @@
 
 SettingsStorage::ReadResult SettingsStorageCache::Get() {
   ReadResult result = delegate_->Get();
   if (!result.HasError()) {
     cache_.MergeDictionary(&result.settings());
   }
   return result;
 }
 
 SettingsStorage::WriteResult SettingsStorageCache::Set(
-    const std::string& key, const Value& value) {
-  WriteResult result = delegate_->Set(key, value);
+    WriteOptions options, const std::string& key, const Value& value) {
+  WriteResult result = delegate_->Set(options, key, value);
   if (!result.HasError()) {
     cache_.SetWithoutPathExpansion(key, value.DeepCopy());
   }
   return result;
 }
 
 SettingsStorage::WriteResult SettingsStorageCache::Set(
-    const DictionaryValue& settings) {
-  WriteResult result = delegate_->Set(settings);
+    WriteOptions options, const DictionaryValue& settings) {
+  WriteResult result = delegate_->Set(options, settings);
   if (result.HasError()) {
     return result;
   }
 
   for (SettingChangeList::const_iterator it = result.changes().begin();
       it != result.changes().end(); ++it) {
     DCHECK(it->new_value());
     cache_.SetWithoutPathExpansion(it->key(), it->new_value()->DeepCopy());
   }
 
   return result;
 }
 
 SettingsStorage::WriteResult SettingsStorageCache::Remove(
-    const std::string& key) {
-  WriteResult result = delegate_->Remove(key);
+    WriteOptions options, const std::string& key) {
+  WriteResult result = delegate_->Remove(options, key);
   if (!result.HasError()) {
     cache_.RemoveWithoutPathExpansion(key, NULL);
   }
   return result;
 }
 
 SettingsStorage::WriteResult SettingsStorageCache::Remove(
-    const std::vector<std::string>& keys) {
-  WriteResult result = delegate_->Remove(keys);
+    WriteOptions options, const std::vector<std::string>& keys) {
+  WriteResult result = delegate_->Remove(options, keys);
   if (result.HasError()) {
     return result;
   }
 
   for (SettingChangeList::const_iterator it = result.changes().begin();
       it != result.changes().end(); ++it) {
     cache_.RemoveWithoutPathExpansion(it->key(), NULL);
   }
 
   return result;
 }
 
-SettingsStorage::WriteResult SettingsStorageCache::Clear() {
-  WriteResult result = delegate_->Clear();
+SettingsStorage::WriteResult SettingsStorageCache::Clear(WriteOptions options) {
+  WriteResult result = delegate_->Clear(options);
   if (!result.HasError()) {
     cache_.Clear();
   }
   return result;
 }
 
 bool SettingsStorageCache::GetFromCache(
     const std::string& key, Value** value) {
   Value* cached_value;
   if (!cache_.GetWithoutPathExpansion(key, &cached_value)) {
     return false;
   }
 
   *value = cached_value->DeepCopy();
   return true;
 }
 
 }  // namespace extensions