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

chrome/browser/extensions/settings/failing_settings_storage.cc

Index: chrome/browser/extensions/settings/failing_settings_storage.cc
diff --git a/chrome/browser/extensions/settings/failing_settings_storage.cc b/chrome/browser/extensions/settings/failing_settings_storage.cc
index 92d5a96bf14baf53f5b82bee3a630ea8c0c07faf..d9cdfceb97c3da9bca006a3c92d92cc92f14da05 100644
--- a/chrome/browser/extensions/settings/failing_settings_storage.cc
+++ b/chrome/browser/extensions/settings/failing_settings_storage.cc
@@ -35,26 +35,27 @@ SettingsStorage::ReadResult FailingSettingsStorage::Get() {
 }
 
 SettingsStorage::WriteResult FailingSettingsStorage::Set(
-    const std::string& key, const Value& value) {
+    WriteOptions options, const std::string& key, const Value& value) {
   return WriteResultError();
 }
 
 SettingsStorage::WriteResult FailingSettingsStorage::Set(
-    const DictionaryValue& settings) {
+    WriteOptions options, const DictionaryValue& settings) {
   return WriteResultError();
 }
 
 SettingsStorage::WriteResult FailingSettingsStorage::Remove(
-    const std::string& key) {
+    WriteOptions options, const std::string& key) {
   return WriteResultError();
 }
 
 SettingsStorage::WriteResult FailingSettingsStorage::Remove(
-    const std::vector<std::string>& keys) {
+    WriteOptions options, const std::vector<std::string>& keys) {
   return WriteResultError();
 }
 
-SettingsStorage::WriteResult FailingSettingsStorage::Clear() {
+SettingsStorage::WriteResult FailingSettingsStorage::Clear(
+    WriteOptions options) {
   return WriteResultError();
 }