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

chrome/browser/extensions/settings/settings_storage_quota_enforcer.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/settings_storage_quota_enforcer.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ skipping 80 matching lines @@
         maybe_settings.error();
     return;
   }
 
   for (DictionaryValue::Iterator it(maybe_settings.settings()); it.HasNext();
       it.Advance()) {
     Allocate(it.key(), it.value(), &used_total_, &used_per_setting_);
   }
 }
 
-SettingsStorageQuotaEnforcer::~SettingsStorageQuotaEnforcer(
-    ) {}
+SettingsStorageQuotaEnforcer::~SettingsStorageQuotaEnforcer() {}
 
 SettingsStorage::ReadResult SettingsStorageQuotaEnforcer::Get(
     const std::string& key) {
   return delegate_->Get(key);
 }
 
 SettingsStorage::ReadResult SettingsStorageQuotaEnforcer::Get(
     const std::vector<std::string>& keys) {
   return delegate_->Get(keys);
 }
 
-SettingsStorage::ReadResult
-SettingsStorageQuotaEnforcer::Get() {
+SettingsStorage::ReadResult SettingsStorageQuotaEnforcer::Get() {
   return delegate_->Get();
 }
 
-SettingsStorage::WriteResult
-SettingsStorageQuotaEnforcer::Set(
-    const std::string& key, const Value& value) {
+SettingsStorage::WriteResult SettingsStorageQuotaEnforcer::Set(
+    WriteOptions options, const std::string& key, const Value& value) {
   size_t new_used_total = used_total_;
   std::map<std::string, size_t> new_used_per_setting = used_per_setting_;
   Allocate(key, value, &new_used_total, &new_used_per_setting);
 
-  if (new_used_total > quota_bytes_) {
-    return QuotaExceededFor(TOTAL_BYTES);
-  }
-  if (new_used_per_setting[key] > quota_bytes_per_setting_) {
-    return QuotaExceededFor(BYTES_PER_SETTING);
-  }
-  if (new_used_per_setting.size() > max_keys_) {
-    return QuotaExceededFor(KEY_COUNT);
+  if (options != FORCE) {

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

Change #3: not enforcing quota from Set (here and below)

[Matt Perry, 2011/11/17 19:53:51]

It looks like FORCE only has an effect for Set(). Do you really need it for
Remove/Clear?

[not at google - send to devlin, 2011/11/18 03:35:21]

Yep.  I added it to Remove and Clear for consistency but I agree that it's
unnecessary.  Reverted those changes, just made it Set.

+    if (new_used_total > quota_bytes_) {
+      return QuotaExceededFor(TOTAL_BYTES);
+    }
+    if (new_used_per_setting[key] > quota_bytes_per_setting_) {
+      return QuotaExceededFor(BYTES_PER_SETTING);
+    }
+    if (new_used_per_setting.size() > max_keys_) {
+      return QuotaExceededFor(KEY_COUNT);
+    }
   }
 
-  WriteResult result = delegate_->Set(key, value);
+  WriteResult result = delegate_->Set(options, key, value);
   if (result.HasError()) {
     return result;
   }
 
   used_total_ = new_used_total;
   used_per_setting_.swap(new_used_per_setting);
   return result;
 }
 
-SettingsStorage::WriteResult
-SettingsStorageQuotaEnforcer::Set(
-    const DictionaryValue& values) {
+SettingsStorage::WriteResult SettingsStorageQuotaEnforcer::Set(
+    WriteOptions options, const DictionaryValue& values) {
   size_t new_used_total = used_total_;
   std::map<std::string, size_t> new_used_per_setting = used_per_setting_;
   for (DictionaryValue::Iterator it(values); it.HasNext(); it.Advance()) {
     Allocate(it.key(), it.value(), &new_used_total, &new_used_per_setting);
-    if (new_used_per_setting[it.key()] > quota_bytes_per_setting_) {
+
+    if (options != FORCE &&
+        new_used_per_setting[it.key()] > quota_bytes_per_setting_) {
       return QuotaExceededFor(BYTES_PER_SETTING);
     }
   }
 
-  if (new_used_total > quota_bytes_) {
-    return QuotaExceededFor(TOTAL_BYTES);
-  }
-  if (new_used_per_setting.size() > max_keys_) {
-    return QuotaExceededFor(KEY_COUNT);
+  if (options != FORCE) {
+    if (new_used_total > quota_bytes_) {
+      return QuotaExceededFor(TOTAL_BYTES);
+    }
+    if (new_used_per_setting.size() > max_keys_) {
+      return QuotaExceededFor(KEY_COUNT);
+    }
   }
 
-  WriteResult result = delegate_->Set(values);
+  WriteResult result = delegate_->Set(options, values);
   if (result.HasError()) {
     return result;
   }
 
   used_total_ = new_used_total;
   used_per_setting_ = new_used_per_setting;
   return result;
 }
 
-SettingsStorage::WriteResult
-SettingsStorageQuotaEnforcer::Remove(
-    const std::string& key) {
-  WriteResult result = delegate_->Remove(key);
+SettingsStorage::WriteResult SettingsStorageQuotaEnforcer::Remove(
+    WriteOptions options, const std::string& key) {
+  WriteResult result = delegate_->Remove(options, key);
   if (result.HasError()) {
     return result;
   }
   Free(&used_total_, &used_per_setting_, key);
   return result;
 }
 
-SettingsStorage::WriteResult
-SettingsStorageQuotaEnforcer::Remove(
-    const std::vector<std::string>& keys) {
-  WriteResult result = delegate_->Remove(keys);
+SettingsStorage::WriteResult SettingsStorageQuotaEnforcer::Remove(
+    WriteOptions options, const std::vector<std::string>& keys) {
+  WriteResult result = delegate_->Remove(options, keys);
   if (result.HasError()) {
     return result;
   }
 
   for (std::vector<std::string>::const_iterator it = keys.begin();
       it != keys.end(); ++it) {
     Free(&used_total_, &used_per_setting_, *it);
   }
   return result;
 }
 
-SettingsStorage::WriteResult
-SettingsStorageQuotaEnforcer::Clear(
-    ) {
-  WriteResult result = delegate_->Clear();
+SettingsStorage::WriteResult SettingsStorageQuotaEnforcer::Clear(
+    WriteOptions options) {
+  WriteResult result = delegate_->Clear(options);
   if (result.HasError()) {
     return result;
   }
 
   while (!used_per_setting_.empty()) {
     Free(&used_total_, &used_per_setting_, used_per_setting_.begin()->first);
   }
   return result;
 }
 
 }  // namespace extensions