[Sync] Generalize StringOrdinal to handle ordinal_in_parent field

chrome/browser/sync/test/integration/sync_app_helper.h

Index: chrome/browser/sync/test/integration/sync_app_helper.h
diff --git a/chrome/browser/sync/test/integration/sync_app_helper.h b/chrome/browser/sync/test/integration/sync_app_helper.h
index e76bd89313e062e302048fce14f77aea221fe812..05398a5529a0f93b18629583f60bac04b11f75db 100644
--- a/chrome/browser/sync/test/integration/sync_app_helper.h
+++ b/chrome/browser/sync/test/integration/sync_app_helper.h
@@ -9,9 +9,9 @@
 
 #include "base/basictypes.h"
 #include "base/memory/singleton.h"
+#include "sync/api/string_ordinal.h"
 
 class Profile;
-class StringOrdinal;
 class SyncTest;
 
 class SyncAppHelper {
@@ -28,24 +28,26 @@ class SyncAppHelper {
   bool AppStatesMatch(Profile* profile1, Profile* profile2);
 
   // Gets the page ordinal value for the applications with |name| in |profile|.
-  StringOrdinal GetPageOrdinalForApp(Profile* profile, const std::string& name);
+  syncer::StringOrdinal GetPageOrdinalForApp(Profile* profile,
+                                             const std::string& name);
 
   // Sets a new |page_ordinal| value for the application with |name| in
   // |profile|.
   void SetPageOrdinalForApp(Profile* profile,
                             const std::string& name,
-                            const StringOrdinal& page_ordinal);
+                            const syncer::StringOrdinal& page_ordinal);
 
   // Gets the app launch ordinal value for the application with |name| in
   // |profile|.
-  StringOrdinal GetAppLaunchOrdinalForApp(Profile* profile,
-                                          const std::string& name);
+  syncer::StringOrdinal GetAppLaunchOrdinalForApp(Profile* profile,
+                                                  const std::string& name);
 
   // Sets a new |app_launch_ordinal| value for the application with |name| in
   // |profile|.
-  void SetAppLaunchOrdinalForApp(Profile* profile,
-                                 const std::string& name,
-                                 const StringOrdinal& app_launch_ordinal);
+  void SetAppLaunchOrdinalForApp(
+      Profile* profile,
+      const std::string& name,
+      const syncer::StringOrdinal& app_launch_ordinal);
 
   // Fix any NTP icon collisions that are currently in |profile|.
   void FixNTPOrdinalCollisions(Profile* profile);