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

chrome/browser/extensions/settings/syncable_settings_storage.h

Index: chrome/browser/extensions/settings/syncable_settings_storage.h
diff --git a/chrome/browser/extensions/settings/syncable_settings_storage.h b/chrome/browser/extensions/settings/syncable_settings_storage.h
index 56bb88a3f609dbd2e5c951b43d52a7881183fc38..1f97e4014cb99702e5f71f2d6c32738e504f414f 100644
--- a/chrome/browser/extensions/settings/syncable_settings_storage.h
+++ b/chrome/browser/extensions/settings/syncable_settings_storage.h
@@ -34,11 +34,17 @@ class SyncableSettingsStorage : 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;
 
   // Sync-related methods, analogous to those on SyncableService (handled by
   // ExtensionSettings), but with looser guarantees about when the methods