Make the Chrome Web Store Icon Syncable

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/common/extensions/extension_constants.h"
+#include "chrome/browser/extensions/extension_service.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"
 #include "chrome/browser/sync/test/integration/sync_app_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 
 using apps_helper::AllProfilesHaveSameAppsAsVerifier;
 using apps_helper::CopyNTPOrdinals;
 using apps_helper::DisableApp;
 using apps_helper::EnableApp;
 using apps_helper::FixNTPOrdinalCollisions;
@@ skipping 345 matching lines @@
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
   StringOrdinal second_position = initial_position.CreateAfter();
   SetAppLaunchOrdinalForApp(GetProfile(0), 0, second_position);
   SetAppLaunchOrdinalForApp(verifier(), 0, second_position);
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
+// Adjust the CWS location within a page on the first client and sync. Adjust
+// which page the CWS appears on and sync. Both clients should have the same
+// page and app launch ordinal values for the CWS.
+IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, UpdateCWSOrdinals) {
+  ASSERT_TRUE(SetupSync());
+  ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());

[akalin, 2012/02/08 18:27:43]

it looks like the integration tests crash if there's a problem with the
ordinals. can you change it so that the test merely fails?  That may require
adding a method to make sure AppState is valid (i.e., contains only valid string
ordinals) and calling those before calling Equals().

[csharp, 2012/02/08 20:02:26]

Done.

+
+  // Change the app launch ordinal.
+  StringOrdinal cws_app_launch_ordinal =
+      GetProfile(0)->GetExtensionService()->GetAppLaunchOrdinal(
+          extension_misc::kWebStoreAppId);
+  GetProfile(0)->GetExtensionService()->SetAppLaunchOrdinal(
+      extension_misc::kWebStoreAppId, cws_app_launch_ordinal.CreateAfter());
+  verifier()->GetExtensionService()->SetAppLaunchOrdinal(
+      extension_misc::kWebStoreAppId, cws_app_launch_ordinal.CreateAfter());
+  ASSERT_TRUE(AwaitQuiescence());
+  ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
+
+  // Change the page ordinal.
+  StringOrdinal cws_page_ordinal =
+      GetProfile(1)->GetExtensionService()->GetPageOrdinal(
+          extension_misc::kWebStoreAppId);
+  GetProfile(1)->GetExtensionService()->SetPageOrdinal(
+      extension_misc::kWebStoreAppId, cws_page_ordinal.CreateAfter());
+  verifier()->GetExtensionService()->SetPageOrdinal(
+      extension_misc::kWebStoreAppId, cws_page_ordinal.CreateAfter());
+  ASSERT_TRUE(AwaitQuiescence());
+  ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
+}
+
 // TODO(akalin): Add tests exercising:
 //   - Offline installation/uninstallation behavior
 //   - App-specific properties