Include v2 packaged apps in sync.

chrome/browser/sync/test/integration/single_client_apps_sync_test.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/basictypes.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/apps_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 
 using apps_helper::AllProfilesHaveSameAppsAsVerifier;
 using apps_helper::InstallApp;
+using apps_helper::InstallPlatformApp;
 
 class SingleClientAppsSyncTest : public SyncTest {
  public:
   SingleClientAppsSyncTest() : SyncTest(SINGLE_CLIENT) {}
 
   virtual ~SingleClientAppsSyncTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SingleClientAppsSyncTest);
 };
@@ skipping 11 matching lines @@
   for (int i = 0; i < kNumApps; ++i) {
     InstallApp(GetProfile(0), i);
     InstallApp(verifier(), i);
   }
 
   ASSERT_TRUE(SetupSync());
 
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
+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());

[akalin, 2012/11/16 18:38:53]

Doesn't AllProfileHaveSameAppsAsVerifier() have to be modified to look for
platform apps? (It may be that the answer is 'no' if it just looks at the sync
type and not the extension type)

(Or perhaps have an AllProfilesHaveSamePlatformAppsAsVerifier() function)

[Marijn Kruisselbrink, 2012/11/16 18:54:30]

As far as I could tell AllProfileHaveSameAppsAsVerifier indeed only looks at the
sync type (so the tests I added would have passed also without the
Extension::GetSyncType change, since then it would just not include them in the
verification either...).

[akalin, 2012/11/16 20:09:06]

Okay, I think you're right.

Can you update the comment to AllProfilesHaveSameAppsAsVerifier() to mention
platform apps?

+}
+
 IN_PROC_BROWSER_TEST_F(SingleClientAppsSyncTest, InstallSomeApps) {

[akalin, 2012/11/16 18:38:53]

can you add an InstallSomePlatformApps test also?

perhaps also another test that installs a mixture of both.

[Marijn Kruisselbrink, 2012/11/16 18:54:30]

Done.

   ASSERT_TRUE(SetupSync());
 
   const int kNumApps = 5;
   for (int i = 0; i < kNumApps; ++i) {
     InstallApp(GetProfile(0), i);
     InstallApp(verifier(), i);
   }
 
   ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion(
       "Waiting for app changes."));
 
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }