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

chrome/browser/extensions/settings/testing_settings_storage.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/settings/testing_settings_storage.h"
 
 #include "base/logging.h"
 
 namespace extensions {
 
@@ skipping 49 matching lines @@
 }
 
 SettingsStorage::ReadResult TestingSettingsStorage::Get() {
   if (fail_all_requests_) {
     return ReadResultError();
   }
   return ReadResult(storage_.DeepCopy());
 }
 
 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();
   }
 
   scoped_ptr<SettingChangeList> changes(new SettingChangeList());
   for (DictionaryValue::Iterator it(settings); it.HasNext(); it.Advance()) {
     Value* old_value = NULL;
     storage_.GetWithoutPathExpansion(it.key(), &old_value);
     if (!old_value || !old_value->Equals(&it.value())) {
       changes->push_back(
           SettingChange(
               it.key(),
               old_value ? old_value->DeepCopy() : old_value,
               it.value().DeepCopy()));
       storage_.SetWithoutPathExpansion(it.key(), it.value().DeepCopy());
     }
   }
   return WriteResult(changes.release());
 }
 
 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();
   }
 
   scoped_ptr<SettingChangeList> changes(
       new SettingChangeList());
   for (std::vector<std::string>::const_iterator it = keys.begin();
       it != keys.end(); ++it) {
     Value* old_value = NULL;
     if (storage_.RemoveWithoutPathExpansion(*it, &old_value)) {
       changes->push_back(SettingChange(*it, old_value, NULL));
     }
   }
   return WriteResult(changes.release());
 }
 
-SettingsStorage::WriteResult TestingSettingsStorage::Clear() {
+SettingsStorage::WriteResult TestingSettingsStorage::Clear(
+    WriteOptions options) {
   if (fail_all_requests_) {
     return WriteResultError();
   }
 
   std::vector<std::string> keys;
   for (DictionaryValue::Iterator it(storage_); it.HasNext(); it.Advance()) {
     keys.push_back(it.key());
   }
-  return Remove(keys);
+  return Remove(options, keys);
 }
 
 }  // namespace extensions