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

chrome/browser/extensions/settings/settings_storage_cache.cc

Index: chrome/browser/extensions/settings/settings_storage_cache.cc
diff --git a/chrome/browser/extensions/settings/settings_storage_cache.cc b/chrome/browser/extensions/settings/settings_storage_cache.cc
index d8a254109f343c7c4642e18795a5980e1ac5ad5b..d2a27c6507f34c9c2e58bbaaa130cb253265d842 100644
--- a/chrome/browser/extensions/settings/settings_storage_cache.cc
+++ b/chrome/browser/extensions/settings/settings_storage_cache.cc
@@ -67,8 +67,8 @@ SettingsStorage::ReadResult SettingsStorageCache::Get() {
 }
 
 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());
   }
@@ -76,8 +76,8 @@ SettingsStorage::WriteResult SettingsStorageCache::Set(
 }
 
 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;
   }
@@ -92,8 +92,8 @@ SettingsStorage::WriteResult SettingsStorageCache::Set(
 }
 
 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);
   }
@@ -101,8 +101,8 @@ SettingsStorage::WriteResult SettingsStorageCache::Remove(
 }
 
 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;
   }
@@ -115,8 +115,8 @@ SettingsStorage::WriteResult SettingsStorageCache::Remove(
   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();
   }