Include v2 packaged apps in sync.

chrome/browser/sync/test/integration/single_client_apps_sync_test.cc

Index: chrome/browser/sync/test/integration/single_client_apps_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/single_client_apps_sync_test.cc b/chrome/browser/sync/test/integration/single_client_apps_sync_test.cc
index cff03fa8d271d4919fa1bbd9d7c9b1393370c462..320b4a2a79d1f3f8bb2cc023ff9d274f4288c687 100644
--- a/chrome/browser/sync/test/integration/single_client_apps_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_apps_sync_test.cc
@@ -9,6 +9,7 @@
 
 using apps_helper::AllProfilesHaveSameAppsAsVerifier;
 using apps_helper::InstallApp;
+using apps_helper::InstallPlatformApp;
 
 class SingleClientAppsSyncTest : public SyncTest {
  public:
@@ -26,7 +27,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, StartWithNoApps) {
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
-IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, StartWithSomeApps) {
+IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, StartWithSomeLegacyApps) {
   ASSERT_TRUE(SetupClients());
 
   const int kNumApps = 5;
@@ -40,7 +41,21 @@ IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, StartWithSomeApps) {
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
-IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, InstallSomeApps) {
+IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, StartWithSomePlatformApps) {
+  ASSERT_TRUE(SetupClients());
+
+  const int kNumApps = 5;
+  for (int i = 0; i < kNumApps; ++i) {
+    InstallPlatformApp(GetProfile(0), i);
+    InstallPlatformApp(verifier(), i);
+  }
+
+  ASSERT_TRUE(SetupSync());
+
+  ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
+}
+
+IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, InstallSomeLegacyApps) {
   ASSERT_TRUE(SetupSync());
 
   const int kNumApps = 5;
@@ -54,3 +69,41 @@ IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, InstallSomeApps) {
 
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
+
+IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, InstallSomePlatformApps) {
+  ASSERT_TRUE(SetupSync());
+
+  const int kNumApps = 5;
+  for (int i = 0; i < kNumApps; ++i) {
+    InstallPlatformApp(GetProfile(0), i);
+    InstallPlatformApp(verifier(), i);
+  }
+
+  ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion(
+      "Waiting for app changes."));
+
+  ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
+}
+
+IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, InstallSomeApps) {
+  ASSERT_TRUE(SetupSync());
+
+  int i = 0;
+
+  const int kNumApps = 5;
+  for (int j = 0; j < kNumApps; ++i, ++j) {
+    InstallApp(GetProfile(0), i);
+    InstallApp(verifier(), i);
+  }
+
+  const int kNumPlatformApps = 5;
+  for (int j = 0; j < kNumPlatformApps; ++i, ++j) {
+    InstallPlatformApp(GetProfile(0), i);
+    InstallPlatformApp(verifier(), i);
+  }
+
+  ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion(
+      "Waiting for app changes."));
+
+  ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
+}