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

chrome/browser/extensions/settings/settings_storage_cache.h

Index: chrome/browser/extensions/settings/settings_storage_cache.h
diff --git a/chrome/browser/extensions/settings/settings_storage_cache.h b/chrome/browser/extensions/settings/settings_storage_cache.h
index fb539ee0960a6702673f09bb7fd508d8f72b2858..0b08a95f26fa2f46783bd2f07a8afb6df7955ea7 100644
--- a/chrome/browser/extensions/settings/settings_storage_cache.h
+++ b/chrome/browser/extensions/settings/settings_storage_cache.h
@@ -30,11 +30,17 @@ class SettingsStorageCache : public SettingsStorage {
   virtual ReadResult Get(const std::string& key) OVERRIDE;
   virtual ReadResult Get(const std::vector<std::string>& keys) OVERRIDE;
   virtual ReadResult Get() OVERRIDE;
-  virtual WriteResult Set(const std::string& key, const Value& value) OVERRIDE;
-  virtual WriteResult Set(const DictionaryValue& settings) OVERRIDE;
-  virtual WriteResult Remove(const std::string& key) OVERRIDE;
-  virtual WriteResult Remove(const std::vector<std::string>& keys) OVERRIDE;
-  virtual WriteResult Clear() OVERRIDE;
+  virtual WriteResult Set(
+      WriteOptions options,
+      const std::string& key,
+      const Value& value) OVERRIDE;
+  virtual WriteResult Set(
+      WriteOptions options, const DictionaryValue& values) OVERRIDE;
+  virtual WriteResult Remove(
+      WriteOptions options, const std::string& key) OVERRIDE;
+  virtual WriteResult Remove(
+      WriteOptions options, const std::vector<std::string>& keys) OVERRIDE;
+  virtual WriteResult Clear(WriteOptions options) OVERRIDE;
 
  private:
   // Returns whether the value was found in the cache.