Extend TwoClientExtensionSettingsSyncTest to test app settings.

chrome/browser/extensions/settings/settings_apitest.cc

Index: chrome/browser/extensions/settings/settings_apitest.cc
diff --git a/chrome/browser/extensions/settings/settings_apitest.cc b/chrome/browser/extensions/settings/settings_apitest.cc
index 093930ee818f899c1f1ad08261aa2c3c64be0c37..9c70e3dd9896002066af18e22e6fbe29b3530f0b 100644
--- a/chrome/browser/extensions/settings/settings_apitest.cc
+++ b/chrome/browser/extensions/settings/settings_apitest.cc
@@ -24,6 +24,9 @@ using namespace settings_namespace;
 
 namespace {
 
+// TODO(kalman): test both EXTENSION_SETTINGS and APP_SETTINGS.
+syncable::ModelType kModelType = syncable::EXTENSION_SETTINGS;

[akalin, 2012/02/27 23:42:10]

const

[not at google - send to devlin, 2012/02/27 23:45:46]

Done.

+
 class NoopSyncChangeProcessor : public SyncChangeProcessor {
  public:
   virtual SyncError ProcessSyncChanges(
@@ -71,8 +74,7 @@ class ExtensionSettingsApiTest : public ExtensionApiTest {
   void InitSync(SyncChangeProcessor* sync_processor) {
     browser()->profile()->GetExtensionService()->
         settings_frontend()->RunWithSyncableService(
-            // TODO(kalman): test both EXTENSION_SETTINGS and APP_SETTINGS.
-            syncable::EXTENSION_SETTINGS,
+            kModelType,
             base::Bind(
                 &ExtensionSettingsApiTest::InitSyncWithSyncableService,
                 this,
@@ -83,8 +85,7 @@ class ExtensionSettingsApiTest : public ExtensionApiTest {
   void SendChanges(const SyncChangeList& change_list) {
     browser()->profile()->GetExtensionService()->
         settings_frontend()->RunWithSyncableService(
-            // TODO(kalman): test both EXTENSION_SETTINGS and APP_SETTINGS.
-            syncable::EXTENSION_SETTINGS,
+            kModelType,
             base::Bind(
                 &ExtensionSettingsApiTest::SendChangesToSyncableService,
                 this,
@@ -138,7 +139,7 @@ class ExtensionSettingsApiTest : public ExtensionApiTest {
   void InitSyncWithSyncableService(
       SyncChangeProcessor* sync_processor, SyncableService* settings_service) {
     EXPECT_FALSE(settings_service->MergeDataAndStartSyncing(
-        syncable::EXTENSION_SETTINGS,
+        kModelType,
         SyncDataList(),
         sync_processor).IsSet());
   }
@@ -290,7 +291,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionSettingsApiTest,
   SyncChangeList sync_changes;
   StringValue bar("bar");
   sync_changes.push_back(settings_sync_util::CreateAdd(
-      extension_id, "foo", bar));
+      extension_id, "foo", bar, kModelType));
   SendChanges(sync_changes);
 
   ReplyWhenSatisfied(SYNC,
@@ -300,7 +301,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionSettingsApiTest,
   // Remove "foo" via sync.
   sync_changes.clear();
   sync_changes.push_back(settings_sync_util::CreateDelete(
-      extension_id, "foo"));
+      extension_id, "foo", kModelType));
   SendChanges(sync_changes);
 
   FinalReplyWhenSatisfied(SYNC,
@@ -338,7 +339,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionSettingsApiTest,
   SyncChangeList sync_changes;
   StringValue bar("bar");
   sync_changes.push_back(settings_sync_util::CreateAdd(
-      extension_id, "foo", bar));
+      extension_id, "foo", bar, kModelType));
   SendChanges(sync_changes);
 
   ReplyWhenSatisfied(LOCAL, "assertNoNotifications", "assertNoNotifications");
@@ -346,7 +347,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionSettingsApiTest,
   // Remove "foo" via sync.
   sync_changes.clear();
   sync_changes.push_back(settings_sync_util::CreateDelete(
-      extension_id, "foo"));
+      extension_id, "foo", kModelType));
   SendChanges(sync_changes);
 
   FinalReplyWhenSatisfied(LOCAL,