Extend TwoClientExtensionSettingsSyncTest to test app settings.

chrome/browser/extensions/settings/settings_sync_util.h

Index: chrome/browser/extensions/settings/settings_sync_util.h
diff --git a/chrome/browser/extensions/settings/settings_sync_util.h b/chrome/browser/extensions/settings/settings_sync_util.h
index 55fee2401bf2c3262838b2eca9f691e28a32c08a..10e9e1f51f1a51dd89b686104a563826c8348f37 100644
--- a/chrome/browser/extensions/settings/settings_sync_util.h
+++ b/chrome/browser/extensions/settings/settings_sync_util.h
@@ -18,27 +18,32 @@ namespace extensions {
 
 namespace settings_sync_util {
 
-// Creates a SyncData object for an extension setting.
+// Creates a SyncData object for an extension or app setting.
 SyncData CreateData(
     const std::string& extension_id,
     const std::string& key,
-    const base::Value& value);
+    const base::Value& value,
+    syncable::ModelType type);
 
-// Creates an "add" sync change for an extension setting.
+// Creates an "add" sync change for an extension or app setting.
 SyncChange CreateAdd(
     const std::string& extension_id,
     const std::string& key,
-    const base::Value& value);
+    const base::Value& value,
+    syncable::ModelType type);
 
-// Creates an "update" sync change for an extension setting.
+// Creates an "update" sync change for an extension or app setting.
 SyncChange CreateUpdate(
-  const std::string& extension_id,
-  const std::string& key,
-  const base::Value& value);
+    const std::string& extension_id,
+    const std::string& key,
+    const base::Value& value,
+    syncable::ModelType type);
 
-// Creates a "delete" sync change for an extension setting.
+// Creates a "delete" sync change for an extension or app setting.
 SyncChange CreateDelete(
-    const std::string& extension_id, const std::string& key);
+    const std::string& extension_id,
+    const std::string& key,
+    syncable::ModelType type);
 
 }  // namespace settings_sync_util