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

chrome/browser/extensions/settings/settings_storage_unittest.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_unittest.h"
 
 #include "base/json/json_writer.h"
 #include "base/file_util.h"
 #include "base/values.h"
 
 namespace extensions {
 
 using content::BrowserThread;
 
 namespace {
 
+// To save typing SettingsStorage::DEFAULTS everywhere.
+const SettingsStorage::WriteOptions DEFAULTS = SettingsStorage::DEFAULTS;
+
 // Gets the pretty-printed JSON for a value.
 std::string GetJSON(const Value& value) {
   std::string json;
   base::JSONWriter::Write(&value, true, &json);
   return json;
 }
 
 // Pretty-prints a set of strings.
 std::string ToString(const std::set<std::string>& strings) {
   std::string string("{");
@@ skipping 165 matching lines @@
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(key1_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(empty_list_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(list123_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get());
 }
 
 TEST_P(ExtensionSettingsStorageTest, GetWithSingleValue) {
   {
     SettingChangeList changes;
     changes.push_back(SettingChange(key1_, NULL, val1_->DeepCopy()));
-    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(key1_, *val1_));
+    EXPECT_PRED_FORMAT2(ChangesEq,
+        changes, storage_->Set(DEFAULTS, key1_, *val1_));
   }
 
   EXPECT_PRED_FORMAT2(SettingsEq, *dict1_, storage_->Get(key1_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(key2_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(key3_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(empty_list_));
   EXPECT_PRED_FORMAT2(SettingsEq, *dict1_, storage_->Get(list123_));
   EXPECT_PRED_FORMAT2(SettingsEq, *dict1_, storage_->Get());
 }
 
 TEST_P(ExtensionSettingsStorageTest, GetWithMultipleValues) {
   {
     SettingChangeList changes;
     changes.push_back(SettingChange(key1_, NULL, val1_->DeepCopy()));
     changes.push_back(SettingChange(key2_, NULL, val2_->DeepCopy()));
-    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(*dict12_));
+    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(DEFAULTS, *dict12_));
   }
 
   EXPECT_PRED_FORMAT2(SettingsEq, *dict1_, storage_->Get(key1_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(key3_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(empty_list_));
   EXPECT_PRED_FORMAT2(SettingsEq, *dict12_, storage_->Get(list123_));
   EXPECT_PRED_FORMAT2(SettingsEq, *dict12_, storage_->Get());
 }
 
 TEST_P(ExtensionSettingsStorageTest, RemoveWhenEmpty) {
   EXPECT_PRED_FORMAT2(ChangesEq,
-      SettingChangeList(), storage_->Remove(key1_));
+      SettingChangeList(), storage_->Remove(DEFAULTS, key1_));
 
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(key1_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(list1_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get());
 }
 
 TEST_P(ExtensionSettingsStorageTest, RemoveWithSingleValue) {
-  storage_->Set(*dict1_);
+  storage_->Set(DEFAULTS, *dict1_);
   {
     SettingChangeList changes;
     changes.push_back(SettingChange(key1_, val1_->DeepCopy(), NULL));
-    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Remove(key1_));
+    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Remove(DEFAULTS, key1_));
   }
 
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(key1_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(key2_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(list1_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(list12_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get());
 }
 
 TEST_P(ExtensionSettingsStorageTest, RemoveWithMultipleValues) {
-  storage_->Set(*dict123_);
+  storage_->Set(DEFAULTS, *dict123_);
   {
     SettingChangeList changes;
     changes.push_back(SettingChange(key3_, val3_->DeepCopy(), NULL));
-    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Remove(key3_));
+    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Remove(DEFAULTS, key3_));
   }
 
   EXPECT_PRED_FORMAT2(SettingsEq, *dict1_, storage_->Get(key1_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(key3_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(empty_list_));
   EXPECT_PRED_FORMAT2(SettingsEq, *dict1_, storage_->Get(list1_));
   EXPECT_PRED_FORMAT2(SettingsEq, *dict12_, storage_->Get(list12_));
   EXPECT_PRED_FORMAT2(SettingsEq, *dict1_, storage_->Get(list13_));
   EXPECT_PRED_FORMAT2(SettingsEq, *dict12_, storage_->Get(list123_));
   EXPECT_PRED_FORMAT2(SettingsEq, *dict12_, storage_->Get());
 
   {
     SettingChangeList changes;
     changes.push_back(SettingChange(key1_, val1_->DeepCopy(), NULL));
     changes.push_back(SettingChange(key2_, val2_->DeepCopy(), NULL));
-    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Remove(list12_));
+    EXPECT_PRED_FORMAT2(ChangesEq,
+        changes, storage_->Remove(DEFAULTS, list12_));
   }
 
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(key1_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(key3_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(empty_list_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(list1_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(list12_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(list13_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(list123_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get());
 }
 
 TEST_P(ExtensionSettingsStorageTest, SetWhenOverwriting) {
-  storage_->Set(key1_, *val2_);
+  storage_->Set(DEFAULTS, key1_, *val2_);
   {
     SettingChangeList changes;
     changes.push_back(
         SettingChange(key1_, val2_->DeepCopy(), val1_->DeepCopy()));
     changes.push_back(SettingChange(key2_, NULL, val2_->DeepCopy()));
-    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(*dict12_));
+    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(DEFAULTS, *dict12_));
   }
 
   EXPECT_PRED_FORMAT2(SettingsEq, *dict1_, storage_->Get(key1_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(key3_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(empty_list_));
   EXPECT_PRED_FORMAT2(SettingsEq, *dict1_, storage_->Get(list1_));
   EXPECT_PRED_FORMAT2(SettingsEq, *dict12_, storage_->Get(list12_));
   EXPECT_PRED_FORMAT2(SettingsEq, *dict1_, storage_->Get(list13_));
   EXPECT_PRED_FORMAT2(SettingsEq, *dict12_, storage_->Get(list123_));
   EXPECT_PRED_FORMAT2(SettingsEq, *dict12_, storage_->Get());
 }
 
 TEST_P(ExtensionSettingsStorageTest, ClearWhenEmpty) {
   EXPECT_PRED_FORMAT2(ChangesEq,
-      SettingChangeList(), storage_->Clear());
+      SettingChangeList(), storage_->Clear(DEFAULTS));
 
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(key1_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(empty_list_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(list123_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get());
 }
 
 TEST_P(ExtensionSettingsStorageTest, ClearWhenNotEmpty) {
-  storage_->Set(*dict12_);
+  storage_->Set(DEFAULTS, *dict12_);
   {
     SettingChangeList changes;
     changes.push_back(SettingChange(key1_, val1_->DeepCopy(), NULL));
     changes.push_back(SettingChange(key2_, val2_->DeepCopy(), NULL));
-    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Clear());
+    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Clear(DEFAULTS));
   }
 
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(key1_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(empty_list_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(list123_));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get());
 }
 
 // Dots should be allowed in key names; they shouldn't be interpreted as
 // indexing into a dictionary.
 TEST_P(ExtensionSettingsStorageTest, DotsInKeyNames) {
   std::string dot_key("foo.bar");
   StringValue dot_value("baz.qux");
   std::vector<std::string> dot_list;
   dot_list.push_back(dot_key);
   DictionaryValue dot_dict;
   dot_dict.SetWithoutPathExpansion(dot_key, dot_value.DeepCopy());
 
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(dot_key));
 
   {
     SettingChangeList changes;
     changes.push_back(
         SettingChange(dot_key, NULL, dot_value.DeepCopy()));
-    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(dot_key, dot_value));
+    EXPECT_PRED_FORMAT2(ChangesEq,
+        changes, storage_->Set(DEFAULTS, dot_key, dot_value));
   }
   EXPECT_PRED_FORMAT2(ChangesEq,
-      SettingChangeList(), storage_->Set(dot_key, dot_value));
+      SettingChangeList(), storage_->Set(DEFAULTS, dot_key, dot_value));
 
   EXPECT_PRED_FORMAT2(SettingsEq, dot_dict, storage_->Get(dot_key));
 
   {
     SettingChangeList changes;
     changes.push_back(
         SettingChange(dot_key, dot_value.DeepCopy(), NULL));
-    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Remove(dot_key));
+    EXPECT_PRED_FORMAT2(ChangesEq,
+        changes, storage_->Remove(DEFAULTS, dot_key));
   }
   EXPECT_PRED_FORMAT2(ChangesEq,
-      SettingChangeList(), storage_->Remove(dot_key));
+      SettingChangeList(), storage_->Remove(DEFAULTS, dot_key));
   {
     SettingChangeList changes;
     changes.push_back(
         SettingChange(dot_key, NULL, dot_value.DeepCopy()));
-    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(dot_dict));
+    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(DEFAULTS, dot_dict));
   }
 
   EXPECT_PRED_FORMAT2(SettingsEq, dot_dict, storage_->Get(dot_list));
   EXPECT_PRED_FORMAT2(SettingsEq, dot_dict, storage_->Get());
 
   {
     SettingChangeList changes;
     changes.push_back(
         SettingChange(dot_key, dot_value.DeepCopy(), NULL));
-    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Remove(dot_list));
+    EXPECT_PRED_FORMAT2(ChangesEq,
+        changes, storage_->Remove(DEFAULTS, dot_list));
   }
 
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get(dot_key));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get());
 }
 
 TEST_P(ExtensionSettingsStorageTest, DotsInKeyNamesWithDicts) {
   DictionaryValue outer_dict;
   DictionaryValue* inner_dict = new DictionaryValue();
   outer_dict.Set("foo", inner_dict);
   inner_dict->SetString("bar", "baz");
 
   {
     SettingChangeList changes;
     changes.push_back(
         SettingChange("foo", NULL, inner_dict->DeepCopy()));
-    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(outer_dict));
+    EXPECT_PRED_FORMAT2(ChangesEq,
+        changes, storage_->Set(DEFAULTS, outer_dict));
   }
 
   EXPECT_PRED_FORMAT2(SettingsEq, outer_dict, storage_->Get("foo"));
   EXPECT_PRED_FORMAT2(SettingsEq, *empty_dict_, storage_->Get("foo.bar"));
 }
 
 TEST_P(ExtensionSettingsStorageTest, ComplexChangedKeysScenarios) {
   // Test:
   //   - Setting over missing/changed/same keys, combinations.
   //   - Removing over missing and present keys, combinations.
   //   - Clearing.
   std::vector<std::string> complex_list;
   DictionaryValue complex_changed_dict;
 
-  storage_->Set(key1_, *val1_);
+  storage_->Set(DEFAULTS, key1_, *val1_);
   EXPECT_PRED_FORMAT2(ChangesEq,
-      SettingChangeList(), storage_->Set(key1_, *val1_));
+      SettingChangeList(), storage_->Set(DEFAULTS, key1_, *val1_));
   {
     SettingChangeList changes;
     changes.push_back(SettingChange(
         key1_, val1_->DeepCopy(), val2_->DeepCopy()));
-    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(key1_, *val2_));
+    EXPECT_PRED_FORMAT2(ChangesEq,
+        changes, storage_->Set(DEFAULTS, key1_, *val2_));
   }
   {
     SettingChangeList changes;
     changes.push_back(SettingChange(key1_, val2_->DeepCopy(), NULL));
-    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Remove(key1_));
+    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Remove(DEFAULTS, key1_));
     EXPECT_PRED_FORMAT2(ChangesEq,
-        SettingChangeList(), storage_->Remove(key1_));
+        SettingChangeList(), storage_->Remove(DEFAULTS, key1_));
   }
   {
     SettingChangeList changes;
     changes.push_back(SettingChange(key1_, NULL, val1_->DeepCopy()));
-    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(key1_, *val1_));
+    EXPECT_PRED_FORMAT2(ChangesEq,
+        changes, storage_->Set(DEFAULTS, key1_, *val1_));
   }
   {
     SettingChangeList changes;
     changes.push_back(SettingChange(key1_, val1_->DeepCopy(), NULL));
-    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Clear());
+    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Clear(DEFAULTS));
     EXPECT_PRED_FORMAT2(ChangesEq,
-        SettingChangeList(), storage_->Clear());
+        SettingChangeList(), storage_->Clear(DEFAULTS));
   }
 
   {
     SettingChangeList changes;
     changes.push_back(SettingChange(key1_, NULL, val1_->DeepCopy()));
     changes.push_back(SettingChange(key2_, NULL, val2_->DeepCopy()));
-    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(*dict12_));
+    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(DEFAULTS, *dict12_));
     EXPECT_PRED_FORMAT2(ChangesEq,
-        SettingChangeList(), storage_->Set(*dict12_));
+        SettingChangeList(), storage_->Set(DEFAULTS, *dict12_));
   }
   {
     SettingChangeList changes;
     changes.push_back(SettingChange(key3_, NULL, val3_->DeepCopy()));
-    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(*dict123_));
+    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(DEFAULTS, *dict123_));
   }
   {
     DictionaryValue to_set;
     to_set.Set(key1_, val2_->DeepCopy());
     to_set.Set(key2_, val2_->DeepCopy());
     to_set.Set("asdf", val1_->DeepCopy());
     to_set.Set("qwerty", val3_->DeepCopy());
 
     SettingChangeList changes;
     changes.push_back(
         SettingChange(key1_, val1_->DeepCopy(), val2_->DeepCopy()));
     changes.push_back(SettingChange("asdf", NULL, val1_->DeepCopy()));
     changes.push_back(
         SettingChange("qwerty", NULL, val3_->DeepCopy()));
-    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(to_set));
+    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(DEFAULTS, to_set));
   }
   {
     SettingChangeList changes;
     changes.push_back(SettingChange(key1_, val2_->DeepCopy(), NULL));
     changes.push_back(SettingChange(key2_, val2_->DeepCopy(), NULL));
-    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Remove(list12_));
+    EXPECT_PRED_FORMAT2(ChangesEq,
+        changes, storage_->Remove(DEFAULTS, list12_));
   }
   {
     std::vector<std::string> to_remove;
     to_remove.push_back(key1_);
     to_remove.push_back("asdf");
 
     SettingChangeList changes;
     changes.push_back(SettingChange("asdf", val1_->DeepCopy(), NULL));
-    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Remove(to_remove));
+    EXPECT_PRED_FORMAT2(ChangesEq,
+        changes, storage_->Remove(DEFAULTS, to_remove));
   }
   {
     SettingChangeList changes;
     changes.push_back(SettingChange(key3_, val3_->DeepCopy(), NULL));
     changes.push_back(
         SettingChange("qwerty", val3_->DeepCopy(), NULL));
-    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Clear());
+    EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Clear(DEFAULTS));
     EXPECT_PRED_FORMAT2(ChangesEq,
-        SettingChangeList(), storage_->Clear());
+        SettingChangeList(), storage_->Clear(DEFAULTS));
   }
 }
 
 }  // namespace extensions