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

chrome/browser/extensions/settings/testing_settings_storage.cc

Index: chrome/browser/extensions/settings/testing_settings_storage.cc
diff --git a/chrome/browser/extensions/settings/testing_settings_storage.cc b/chrome/browser/extensions/settings/testing_settings_storage.cc
index 7b256ec2157095ae3b94d9066124c8cb1bad7dcf..c7949a8527280a9eb7e805196acb889bae69dd4f 100644
--- a/chrome/browser/extensions/settings/testing_settings_storage.cc
+++ b/chrome/browser/extensions/settings/testing_settings_storage.cc
@@ -67,14 +67,14 @@ SettingsStorage::ReadResult TestingSettingsStorage::Get() {
 }
 
 SettingsStorage::WriteResult TestingSettingsStorage::Set(
-    const std::string& key, const Value& value) {
+    WriteOptions options, const std::string& key, const Value& value) {
   DictionaryValue settings;
   settings.SetWithoutPathExpansion(key, value.DeepCopy());
-  return Set(settings);
+  return Set(options, settings);
 }
 
 SettingsStorage::WriteResult TestingSettingsStorage::Set(
-    const DictionaryValue& settings) {
+    WriteOptions options, const DictionaryValue& settings) {
   if (fail_all_requests_) {
     return WriteResultError();
   }
@@ -96,12 +96,12 @@ SettingsStorage::WriteResult TestingSettingsStorage::Set(
 }
 
 SettingsStorage::WriteResult TestingSettingsStorage::Remove(
-    const std::string& key) {
-  return Remove(CreateVector(key));
+    WriteOptions options, const std::string& key) {
+  return Remove(options, CreateVector(key));
 }
 
 SettingsStorage::WriteResult TestingSettingsStorage::Remove(
-    const std::vector<std::string>& keys) {
+    WriteOptions options, const std::vector<std::string>& keys) {
   if (fail_all_requests_) {
     return WriteResultError();
   }
@@ -118,7 +118,8 @@ SettingsStorage::WriteResult TestingSettingsStorage::Remove(
   return WriteResult(changes.release());
 }
 
-SettingsStorage::WriteResult TestingSettingsStorage::Clear() {
+SettingsStorage::WriteResult TestingSettingsStorage::Clear(
+    WriteOptions options) {
   if (fail_all_requests_) {
     return WriteResultError();
   }
@@ -127,7 +128,7 @@ SettingsStorage::WriteResult TestingSettingsStorage::Clear() {
   for (DictionaryValue::Iterator it(storage_); it.HasNext(); it.Advance()) {
     keys.push_back(it.key());
   }
-  return Remove(keys);
+  return Remove(options, keys);
 }
 
 }  // namespace extensions