Adding new extension sync integration tests. Also modified the way that profile

chrome/test/live_sync/two_client_live_apps_sync_test.cc

Index: chrome/test/live_sync/two_client_live_apps_sync_test.cc
diff --git a/chrome/test/live_sync/two_client_live_apps_sync_test.cc b/chrome/test/live_sync/two_client_live_apps_sync_test.cc
index 5cba44b0de0c10334d1dc9b7dc10aa41c6c2bf19..b674af5bd04f883edb4dc392afb59253561b1704 100644
--- a/chrome/test/live_sync/two_client_live_apps_sync_test.cc
+++ b/chrome/test/live_sync/two_client_live_apps_sync_test.cc
@@ -147,6 +147,82 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveAppsSyncTest, Uninstall) {
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
+// TCM ID - 3699295.
+IN_PROC_BROWSER_TEST_F(TwoClientLiveAppsSyncTest, Merge) {

[anna, 2011/06/09 21:37:58]

It would be great to test the merge of a delete as well.

[braffert, 2011/06/09 23:09:35]

Done.

+  ASSERT_TRUE(SetupSync());
+  ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
+
+  InstallApp(GetProfile(0), 0);
+  InstallApp(verifier(), 0);
+
+  InstallApp(GetProfile(0), 1);
+  InstallApp(GetProfile(1), 1);
+  InstallApp(verifier(), 1);
+
+  InstallApp(GetProfile(1), 2);
+  InstallApp(verifier(), 2);
+
+  ASSERT_TRUE(AwaitQuiescence());
+  InstallAppsPendingForSync(GetProfile(0));
+  InstallAppsPendingForSync(GetProfile(1));
+  ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
+}
+
+IN_PROC_BROWSER_TEST_F(TwoClientLiveAppsSyncTest, UpdateEnableDisableApp) {

[braffert, 2011/06/09 18:20:42]

Couldn't find TCM ids for these two cases.

[akalin, 2011/06/09 20:35:37]

Not sure if they're needed -- ask Anna?

[anna, 2011/06/09 21:37:58]

TCM ID: 7723126

[braffert, 2011/06/09 23:09:35]

Done.

+  ASSERT_TRUE(SetupSync());
+  ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
+
+  InstallApp(GetProfile(0), 0);
+  InstallApp(GetProfile(1), 0);
+  InstallApp(verifier(), 0);
+  ASSERT_TRUE(AwaitQuiescence());
+  ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
+
+  DisableApp(GetProfile(0), 0);
+  DisableApp(verifier(), 0);
+  ASSERT_TRUE(HasSameAppsAsVerifier(0));
+  ASSERT_FALSE(HasSameAppsAsVerifier(1));
+
+  ASSERT_TRUE(AwaitQuiescence());
+  ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
+
+  EnableApp(GetProfile(1), 0);
+  EnableApp(verifier(), 0);
+  ASSERT_TRUE(HasSameAppsAsVerifier(1));
+  ASSERT_FALSE(HasSameAppsAsVerifier(0));
+
+  ASSERT_TRUE(AwaitQuiescence());
+  ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
+}
+
+IN_PROC_BROWSER_TEST_F(TwoClientLiveAppsSyncTest,
+                       UpdateIncognitoEnableDisable) {

[anna, 2011/06/09 21:37:58]

TCM ID: 7706637

[braffert, 2011/06/09 23:09:35]

Done.

+  ASSERT_TRUE(SetupSync());
+  ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
+
+  InstallApp(GetProfile(0), 0);
+  InstallApp(GetProfile(1), 0);
+  InstallApp(verifier(), 0);
+  ASSERT_TRUE(AwaitQuiescence());
+  ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
+
+  IncognitoEnableApp(GetProfile(0), 0);
+  IncognitoEnableApp(verifier(), 0);
+  ASSERT_TRUE(HasSameAppsAsVerifier(0));
+  ASSERT_FALSE(HasSameAppsAsVerifier(1));
+
+  ASSERT_TRUE(AwaitQuiescence());
+  ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
+
+  IncognitoDisableApp(GetProfile(1), 0);
+  IncognitoDisableApp(verifier(), 0);
+  ASSERT_TRUE(HasSameAppsAsVerifier(1));
+  ASSERT_FALSE(HasSameAppsAsVerifier(0));
+
+  ASSERT_TRUE(AwaitQuiescence());
+  ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
+}
+
 // TCM ID - 3718276.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveAppsSyncTest, DisableApps) {
   ASSERT_TRUE(SetupSync());