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..3165b49548b4f38e34b5d0c9f7192f3885cb5518 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;
   }