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

chrome/browser/extensions/settings/syncable_settings_storage.cc

Index: chrome/browser/extensions/settings/syncable_settings_storage.cc
diff --git a/chrome/browser/extensions/settings/syncable_settings_storage.cc b/chrome/browser/extensions/settings/syncable_settings_storage.cc
index 799b6b092a03fdaa2c5ba9152301e33e4328ea24..200b9205befb1d320eaadf39a42790255ba8e8b0 100644
--- a/chrome/browser/extensions/settings/syncable_settings_storage.cc
+++ b/chrome/browser/extensions/settings/syncable_settings_storage.cc
@@ -49,9 +49,9 @@ SettingsStorage::ReadResult SyncableSettingsStorage::Get() {
 }
 
 SettingsStorage::WriteResult SyncableSettingsStorage::Set(
-    const std::string& key, const Value& value) {
+    WriteOptions options, const std::string& key, const Value& value) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  WriteResult result = delegate_->Set(key, value);
+  WriteResult result = delegate_->Set(options, key, value);
   if (result.HasError()) {
     return result;
   }
@@ -62,9 +62,9 @@ SettingsStorage::WriteResult SyncableSettingsStorage::Set(
 }
 
 SettingsStorage::WriteResult SyncableSettingsStorage::Set(
-    const DictionaryValue& values) {
+    WriteOptions options, const DictionaryValue& values) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  WriteResult result = delegate_->Set(values);
+  WriteResult result = delegate_->Set(options, values);
   if (result.HasError()) {
     return result;
   }
@@ -75,9 +75,9 @@ SettingsStorage::WriteResult SyncableSettingsStorage::Set(
 }
 
 SettingsStorage::WriteResult SyncableSettingsStorage::Remove(
-    const std::string& key) {
+    WriteOptions options, const std::string& key) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  WriteResult result = delegate_->Remove(key);
+  WriteResult result = delegate_->Remove(options, key);
   if (result.HasError()) {
     return result;
   }
@@ -88,9 +88,9 @@ SettingsStorage::WriteResult SyncableSettingsStorage::Remove(
 }
 
 SettingsStorage::WriteResult SyncableSettingsStorage::Remove(
-    const std::vector<std::string>& keys) {
+    WriteOptions options, const std::vector<std::string>& keys) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  WriteResult result = delegate_->Remove(keys);
+  WriteResult result = delegate_->Remove(options, keys);
   if (result.HasError()) {
     return result;
   }
@@ -100,10 +100,10 @@ SettingsStorage::WriteResult SyncableSettingsStorage::Remove(
   return result;
 }
 
-SettingsStorage::WriteResult
-SyncableSettingsStorage::Clear() {
+SettingsStorage::WriteResult SyncableSettingsStorage::Clear(
+    WriteOptions options) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  WriteResult result = delegate_->Clear();
+  WriteResult result = delegate_->Clear(options);
   if (result.HasError()) {
     return result;
   }
@@ -396,7 +396,7 @@ SyncError SyncableSettingsStorage::OnSyncAdd(
     SettingChangeList* changes) {
   DCHECK(new_value);
   synced_keys_.insert(key);
-  WriteResult result = delegate_->Set(key, *new_value);
+  WriteResult result = delegate_->Set(FORCE, key, *new_value);

[not at google - send to devlin, 2011/11/17 07:02:53]

Change #5: forcing changes that come from sync (here and 2 below)

   if (result.HasError()) {
     return SyncError(
         FROM_HERE,
@@ -415,7 +415,7 @@ SyncError SyncableSettingsStorage::OnSyncUpdate(
     SettingChangeList* changes) {
   DCHECK(old_value);
   DCHECK(new_value);
-  WriteResult result = delegate_->Set(key, *new_value);
+  WriteResult result = delegate_->Set(FORCE, key, *new_value);
   if (result.HasError()) {
     return SyncError(
         FROM_HERE,
@@ -433,7 +433,7 @@ SyncError SyncableSettingsStorage::OnSyncDelete(
     SettingChangeList* changes) {
   DCHECK(old_value);
   synced_keys_.erase(key);
-  WriteResult result = delegate_->Remove(key);
+  WriteResult result = delegate_->Remove(FORCE, key);
   if (result.HasError()) {
     return SyncError(
         FROM_HERE,