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

chrome/browser/extensions/settings/settings_frontend_unittest.cc

Index: chrome/browser/extensions/settings/settings_frontend_unittest.cc
diff --git a/chrome/browser/extensions/settings/settings_frontend_unittest.cc b/chrome/browser/extensions/settings/settings_frontend_unittest.cc
index e4a143393049d4e2860e7c2c10d1cc73190c0db3..e9bcc09f490ca8b314afcca69dc6cc10bb6c724c 100644
--- a/chrome/browser/extensions/settings/settings_frontend_unittest.cc
+++ b/chrome/browser/extensions/settings/settings_frontend_unittest.cc
@@ -23,6 +23,9 @@ using namespace settings_test_util;
 
 namespace {
 
+// To save typing SettingsStorage::DEFAULTS everywhere.
+const SettingsStorage::WriteOptions DEFAULTS = SettingsStorage::DEFAULTS;
+
 // A SettingsStorageFactory which always returns NULL.
 class NullSettingsStorageFactory : public SettingsStorageFactory {
  public:
@@ -89,7 +92,7 @@ TEST_F(ExtensionSettingsFrontendTest, SettingsPreservedAcrossReconstruction) {
   // be too rigorous.
   {
     StringValue bar("bar");
-    SettingsStorage::WriteResult result = storage->Set("foo", bar);
+    SettingsStorage::WriteResult result = storage->Set(DEFAULTS, "foo", bar);
     ASSERT_FALSE(result.HasError());
   }
 
@@ -118,7 +121,7 @@ TEST_F(ExtensionSettingsFrontendTest, SettingsClearedOnUninstall) {
 
   {
     StringValue bar("bar");
-    SettingsStorage::WriteResult result = storage->Set("foo", bar);
+    SettingsStorage::WriteResult result = storage->Set(DEFAULTS, "foo", bar);
     ASSERT_FALSE(result.HasError());
   }
 
@@ -144,7 +147,7 @@ TEST_F(ExtensionSettingsFrontendTest, LeveldbDatabaseDeletedFromDiskOnClear) {
 
   {
     StringValue bar("bar");
-    SettingsStorage::WriteResult result = storage->Set("foo", bar);
+    SettingsStorage::WriteResult result = storage->Set(DEFAULTS, "foo", bar);
     ASSERT_FALSE(result.HasError());
     EXPECT_TRUE(file_util::PathExists(temp_dir_.path()));
   }
@@ -152,7 +155,7 @@ TEST_F(ExtensionSettingsFrontendTest, LeveldbDatabaseDeletedFromDiskOnClear) {
   // Should need to both clear the database and delete the frontend for the
   // leveldb database to be deleted from disk.
   {
-    SettingsStorage::WriteResult result = storage->Clear();
+    SettingsStorage::WriteResult result = storage->Clear(DEFAULTS);
     ASSERT_FALSE(result.HasError());
     EXPECT_TRUE(file_util::PathExists(temp_dir_.path()));
   }
@@ -178,9 +181,9 @@ TEST_F(ExtensionSettingsFrontendTest,
   ASSERT_TRUE(storage != NULL);
 
   EXPECT_TRUE(storage->Get().HasError());
-  EXPECT_TRUE(storage->Clear().HasError());
-  EXPECT_TRUE(storage->Set("foo", bar).HasError());
-  EXPECT_TRUE(storage->Remove("foo").HasError());
+  EXPECT_TRUE(storage->Clear(DEFAULTS).HasError());
+  EXPECT_TRUE(storage->Set(DEFAULTS, "foo", bar).HasError());
+  EXPECT_TRUE(storage->Remove(DEFAULTS, "foo").HasError());
 
   // For simplicity: just always fail those requests, even if the leveldb
   // storage areas start working.
@@ -190,9 +193,9 @@ TEST_F(ExtensionSettingsFrontendTest,
   ASSERT_TRUE(storage != NULL);
 
   EXPECT_TRUE(storage->Get().HasError());
-  EXPECT_TRUE(storage->Clear().HasError());
-  EXPECT_TRUE(storage->Set("foo", bar).HasError());
-  EXPECT_TRUE(storage->Remove("foo").HasError());
+  EXPECT_TRUE(storage->Clear(DEFAULTS).HasError());
+  EXPECT_TRUE(storage->Set(DEFAULTS, "foo", bar).HasError());
+  EXPECT_TRUE(storage->Remove(DEFAULTS, "foo").HasError());
 }
 
 }  // namespace extensions