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..fc78991f881c5f6ebbacc3f65bd6638fb4fe5c17 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();
   }