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

chrome/browser/extensions/settings/settings_api.cc

Index: chrome/browser/extensions/settings/settings_api.cc
diff --git a/chrome/browser/extensions/settings/settings_api.cc b/chrome/browser/extensions/settings/settings_api.cc
index a927a01287754a7b18b88a387426d397768f47e7..c2aee9395bbc5e0f44c7a0b0e9a10d8d4c4e7218 100644
--- a/chrome/browser/extensions/settings/settings_api.cc
+++ b/chrome/browser/extensions/settings/settings_api.cc
@@ -148,7 +148,8 @@ bool SetSettingsFunction::RunWithStorage(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   DictionaryValue *input;
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &input));
-  return UseWriteResult(observers, storage->Set(*input));
+  return UseWriteResult(
+      observers, storage->Set(SettingsStorage::DEFAULTS, *input));
 }
 
 bool RemoveSettingsFunction::RunWithStorage(
@@ -162,13 +163,16 @@ bool RemoveSettingsFunction::RunWithStorage(
     case Value::TYPE_STRING: {
       std::string as_string;
       input->GetAsString(&as_string);
-      return UseWriteResult(observers, storage->Remove(as_string));
+      return UseWriteResult(
+          observers, storage->Remove(SettingsStorage::DEFAULTS, as_string));
     }
 
     case Value::TYPE_LIST: {
       std::vector<std::string> as_string_list;
       AddAllStringValues(*static_cast<ListValue*>(input), &as_string_list);
-      return UseWriteResult(observers, storage->Remove(as_string_list));
+      return UseWriteResult(
+          observers,
+          storage->Remove(SettingsStorage::DEFAULTS, as_string_list));
     }
 
     default:
@@ -182,7 +186,7 @@ bool ClearSettingsFunction::RunWithStorage(
     scoped_refptr<SettingsObserverList> observers,
     SettingsStorage* storage) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  return UseWriteResult(observers, storage->Clear());
+  return UseWriteResult(observers, storage->Clear(SettingsStorage::DEFAULTS));
 }
 
 }  // namespace extensions