Extend TwoClientExtensionSettingsSyncTest to test app settings.

chrome/browser/extensions/settings/settings_apitest.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/settings/settings_frontend.h"
 #include "chrome/browser/extensions/settings/settings_namespace.h"
 #include "chrome/browser/extensions/settings/settings_sync_util.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/api/sync_change.h"
 #include "chrome/browser/sync/api/sync_change_processor.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 
 namespace extensions {
 
 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(
       const tracked_objects::Location& from_here,
       const SyncChangeList& change_list) OVERRIDE {
     return SyncError();
   }
 
   virtual ~NoopSyncChangeProcessor() {};
 };
@@ skipping 27 matching lines @@
       Namespace settings_namespace,
       const std::string& normal_action,
       const std::string& incognito_action) {
     MaybeLoadAndReplyWhenSatisfied(
         settings_namespace, normal_action, incognito_action, NULL, true);
   }
 
   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,
                 sync_processor));
     MessageLoop::current()->RunAllPending();
   }
 
   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,
                 change_list));
     MessageLoop::current()->RunAllPending();
   }
 
  private:
   const Extension* MaybeLoadAndReplyWhenSatisfied(
       Namespace settings_namespace,
@@ skipping 33 matching lines @@
     message->SetString("action", action);
     message->SetBoolean("isFinalAction", is_final_action);
     std::string message_json;
     base::JSONWriter::Write(message.get(), false, &message_json);
     return message_json;
   }
 
   void InitSyncWithSyncableService(
       SyncChangeProcessor* sync_processor, SyncableService* settings_service) {
     EXPECT_FALSE(settings_service->MergeDataAndStartSyncing(
-        syncable::EXTENSION_SETTINGS,
+        kModelType,
         SyncDataList(),
         sync_processor).IsSet());
   }
 
   void SendChangesToSyncableService(
       const SyncChangeList& change_list, SyncableService* settings_service) {
     EXPECT_FALSE(
         settings_service->ProcessSyncChanges(FROM_HERE, change_list).IsSet());
   }
 };
@@ skipping 131 matching lines @@
           "assertNoNotifications", "assertNoNotifications", "split_incognito");
   const std::string& extension_id = extension->id();
 
   NoopSyncChangeProcessor sync_processor;
   InitSync(&sync_processor);
 
   // Set "foo" to "bar" via sync.
   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,
       "assertAddFooNotification", "assertAddFooNotification");
   ReplyWhenSatisfied(SYNC, "clearNotifications", "clearNotifications");
 
   // 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,
       "assertDeleteFooNotification", "assertDeleteFooNotification");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message();
 }
 
 // Disabled, see crbug.com/101110
@@ skipping 17 matching lines @@
           "assertNoNotifications", "assertNoNotifications", "split_incognito");
   const std::string& extension_id = extension->id();
 
   NoopSyncChangeProcessor sync_processor;
   InitSync(&sync_processor);
 
   // Set "foo" to "bar" via sync.
   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");
 
   // 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,
       "assertNoNotifications", "assertNoNotifications");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message();
 }
 
 }  // namespace extensions