[Sync] Generalize StringOrdinal to handle ordinal_in_parent field

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"
 #include "chrome/browser/sync/test/integration/sync_app_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/common/extensions/extension_constants.h"
+#include "sync/api/string_ordinal.h"
 
 using apps_helper::AllProfilesHaveSameAppsAsVerifier;
 using apps_helper::CopyNTPOrdinals;
 using apps_helper::DisableApp;
 using apps_helper::EnableApp;
 using apps_helper::FixNTPOrdinalCollisions;
 using apps_helper::HasSameAppsAsVerifier;
 using apps_helper::IncognitoDisableApp;
 using apps_helper::IncognitoEnableApp;
 using apps_helper::InstallApp;
@@ skipping 306 matching lines @@
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
 // Install the same app on both clients, then sync. Change the page ordinal on
 // one client and sync. Both clients should have the updated page ordinal for
 // the app.
 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, UpdatePageOrdinal) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
-  StringOrdinal initial_page = StringOrdinal::CreateInitialOrdinal();
+  syncer::StringOrdinal initial_page =
+      syncer::StringOrdinal::CreateInitialOrdinal();
   InstallApp(GetProfile(0), 0);
   InstallApp(GetProfile(1), 0);
   InstallApp(verifier(), 0);
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
-  StringOrdinal second_page = initial_page.CreateAfter();
+  syncer::StringOrdinal second_page = initial_page.CreateAfter();
   SetPageOrdinalForApp(GetProfile(0), 0, second_page);
   SetPageOrdinalForApp(verifier(), 0, second_page);
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
 // Install the same app on both clients, then sync. Change the app launch
 // ordinal on one client and sync. Both clients should have the updated app
 // launch ordinal for the app.
 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, UpdateAppLaunchOrdinal) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
-  StringOrdinal initial_position = StringOrdinal::CreateInitialOrdinal();
+  syncer::StringOrdinal initial_position =
+      syncer::StringOrdinal::CreateInitialOrdinal();
   InstallApp(GetProfile(0), 0);
   InstallApp(GetProfile(1), 0);
   InstallApp(verifier(), 0);
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
-  StringOrdinal second_position = initial_position.CreateAfter();
+  syncer::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());
 
   // Change the app launch ordinal.
-  StringOrdinal cws_app_launch_ordinal = GetProfile(0)->GetExtensionService()->
+  syncer::StringOrdinal cws_app_launch_ordinal =
+      GetProfile(0)->GetExtensionService()->
       extension_prefs()->extension_sorting()->GetAppLaunchOrdinal(
           extension_misc::kWebStoreAppId);
   GetProfile(0)->GetExtensionService()->extension_prefs()->extension_sorting()->
       SetAppLaunchOrdinal(
           extension_misc::kWebStoreAppId, cws_app_launch_ordinal.CreateAfter());
   verifier()->GetExtensionService()->extension_prefs()->extension_sorting()->
       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()->
+  syncer::StringOrdinal cws_page_ordinal =
+      GetProfile(1)->GetExtensionService()->
       extension_prefs()->extension_sorting()->GetPageOrdinal(
           extension_misc::kWebStoreAppId);
   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());
 }
 
 // TODO(akalin): Add tests exercising:
 //   - Offline installation/uninstallation behavior
 //   - App-specific properties