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

chrome/browser/extensions/settings/syncable_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/syncable_settings_storage.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/settings/settings_sync_util.h"
 #include "chrome/browser/sync/api/sync_data.h"
 #include "chrome/browser/sync/protocol/extension_setting_specifics.pb.h"
@@ skipping 31 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   return delegate_->Get(keys);
 }
 
 SettingsStorage::ReadResult SyncableSettingsStorage::Get() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   return delegate_->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;
   }
   if (sync_processor_ && !result.changes().empty()) {
     SendChangesToSync(result.changes());
   }
   return result;
 }
 
 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;
   }
   if (sync_processor_ && !result.changes().empty()) {
     SendChangesToSync(result.changes());
   }
   return result;
 }
 
 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;
   }
   if (sync_processor_ && !result.changes().empty()) {
     SendChangesToSync(result.changes());
   }
   return result;
 }
 
 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;
   }
   if (sync_processor_ && !result.changes().empty()) {
     SendChangesToSync(result.changes());
   }
   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;
   }
   if (sync_processor_ && !result.changes().empty()) {
     SendChangesToSync(result.changes());
   }
   return result;
 }
 
 // Sync-related methods.
@@ skipping 272 matching lines @@
     synced_keys_.erase(*it);
   }
 }
 
 SyncError SyncableSettingsStorage::OnSyncAdd(
     const std::string& key,
     Value* new_value,
     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,
         std::string("Error pushing sync add to local settings: ") +
             result.error(),
         sync_type_);
   }
   changes->push_back(SettingChange(key, NULL, new_value));
   return SyncError();
 }
 
 SyncError SyncableSettingsStorage::OnSyncUpdate(
     const std::string& key,
     Value* old_value,
     Value* new_value,
     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,
         std::string("Error pushing sync update to local settings: ") +
             result.error(),
         sync_type_);
   }
   changes->push_back(SettingChange(key, old_value, new_value));
   return SyncError();
 }
 
 SyncError SyncableSettingsStorage::OnSyncDelete(
     const std::string& key,
     Value* old_value,
     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,
         std::string("Error pushing sync remove to local settings: ") +
             result.error(),
         sync_type_);
   }
   changes->push_back(SettingChange(key, old_value, NULL));
   return SyncError();
 }
 
 }  // namespace extensions