Separate the NTP app ordering from the app list app ordering

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

 // Copyright (c) 2012 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/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_sorting.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/apps_helper.h"
@@ skipping 11 matching lines @@
 using apps_helper::HasSameAppsAsVerifier;
 using apps_helper::IncognitoDisableApp;
 using apps_helper::IncognitoEnableApp;
 using apps_helper::InstallApp;
 using apps_helper::InstallAppsPendingForSync;
 using apps_helper::InstallPlatformApp;
 using apps_helper::SetAppLaunchOrdinalForApp;
 using apps_helper::SetPageOrdinalForApp;
 using apps_helper::UninstallApp;
 
+namespace {
+
+void MoveChromeAppToEnd(AppListExtensionSorting* ordering) {
+  ordering->Erase(extension_misc::kChromeAppId);
+  ordering->InsertAtBack(extension_misc::kChromeAppId);
+}
+
+}  // namespace
+
 class TwoClientAppsSyncTest : public SyncTest {
  public:
   TwoClientAppsSyncTest() : SyncTest(TWO_CLIENT) {}
 
   virtual ~TwoClientAppsSyncTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TwoClientAppsSyncTest);
 };
 
@@ skipping 373 matching lines @@
   GetProfile(1)->GetExtensionService()->extension_prefs()->
       extension_sorting()->SetPageOrdinal(extension_misc::kWebStoreAppId,
                                           cws_page_ordinal.CreateAfter());
   verifier()->GetExtensionService()->extension_prefs()->
       extension_sorting()->SetPageOrdinal(extension_misc::kWebStoreAppId,
                                           cws_page_ordinal.CreateAfter());
   ASSERT_TRUE(AwaitQuiescence());
   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.
+  AppListExtensionSorting* ordering =
+      GetProfile(0)->GetExtensionService()->extension_prefs()->
+          app_list_extension_sorting();
+  AppListExtensionSorting* verifier_ordering =
+      verifier()->GetExtensionService()->extension_prefs()->
+          app_list_extension_sorting();
+
+  MoveChromeAppToEnd(ordering);
+  MoveChromeAppToEnd(verifier_ordering);
+
+  ASSERT_TRUE(AwaitQuiescence());
+  ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
+}
+
 // TODO(akalin): Add tests exercising:
 //   - Offline installation/uninstallation behavior
 //   - App-specific properties