Separate the NTP app ordering from the app list app ordering

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

Index: chrome/browser/sync/test/integration/two_client_apps_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc b/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc
index 2db4c35e7795b98cd415d23746fbb8a580414712..f11194483a5ecd1b76dc7b194a41d3a3780363dd 100644
--- a/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc
@@ -422,6 +422,28 @@ IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, UpdateCWSOrdinals) {
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
+// Adjust the chrome app location within the app list on the first client and
+// sync. Both clients should have the same app list ordinal values for the
+// chrome app.
+IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, UpdateChromeAppAppListOrdinal) {
+  ASSERT_TRUE(SetupSync());
+  ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
+
+  // Change the app list ordinal.
+  AppListExtensionOrdering* ordering =
+      GetProfile(0)->GetExtensionService()->extension_prefs()->
+          app_list_extension_ordering();
+  AppListExtensionOrdering* verifier_ordering =
+      verifier()->GetExtensionService()->extension_prefs()->
+          app_list_extension_ordering();
+  ordering->Erase(extension_misc::kChromeAppId);
+  verifier_ordering->Erase(extension_misc::kChromeAppId);
+  ordering->InsertAtNextAvailable(extension_misc::kChromeAppId);
+  verifier_ordering->InsertAtNextAvailable(extension_misc::kChromeAppId);

[koz (OOO until 15th September), 2013/06/18 07:41:36]

This might read better like

MoveChromeAppToEnd(ordering);
MoveChromeAppToEnd(verifier_ordering);

[calamity, 2013/06/19 05:09:17]

Done.

+  ASSERT_TRUE(AwaitQuiescence());
+  ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
+}
+
 // TODO(akalin): Add tests exercising:
 //   - Offline installation/uninstallation behavior
 //   - App-specific properties