[Sync] Generalize StringOrdinal to handle ordinal_in_parent field

chrome/browser/sync/test/integration/apps_helper.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 "chrome/browser/sync/test/integration/apps_helper.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/sync_app_helper.h"
@@ skipping 65 matching lines @@
 void IncognitoDisableApp(Profile* profile, int index) {
   return SyncExtensionHelper::GetInstance()->IncognitoDisableExtension(
       profile, CreateFakeAppName(index));
 }
 
 void InstallAppsPendingForSync(Profile* profile) {
   SyncExtensionHelper::GetInstance()->InstallExtensionsPendingForSync(
       profile, extensions::Extension::TYPE_HOSTED_APP);
 }
 
-StringOrdinal GetPageOrdinalForApp(Profile* profile,
-                                   int app_index) {
+syncer::StringOrdinal GetPageOrdinalForApp(Profile* profile,
+                                           int app_index) {
   return SyncAppHelper::GetInstance()->GetPageOrdinalForApp(
       profile, CreateFakeAppName(app_index));
 }
 
 void SetPageOrdinalForApp(Profile* profile,
                           int app_index,
-                          const StringOrdinal& page_ordinal) {
+                          const syncer::StringOrdinal& page_ordinal) {
   SyncAppHelper::GetInstance()->SetPageOrdinalForApp(
       profile, CreateFakeAppName(app_index), page_ordinal);
 }
 
-StringOrdinal GetAppLaunchOrdinalForApp(Profile* profile,
-                                        int app_index) {
+syncer::StringOrdinal GetAppLaunchOrdinalForApp(Profile* profile,
+                                                int app_index) {
   return SyncAppHelper::GetInstance()->GetAppLaunchOrdinalForApp(
       profile, CreateFakeAppName(app_index));
 }
 
-void SetAppLaunchOrdinalForApp(Profile* profile,
-                               int app_index,
-                               const StringOrdinal& app_launch_ordinal) {
+void SetAppLaunchOrdinalForApp(
+    Profile* profile,
+    int app_index,
+    const syncer::StringOrdinal& app_launch_ordinal) {
   SyncAppHelper::GetInstance()->SetAppLaunchOrdinalForApp(
       profile, CreateFakeAppName(app_index), app_launch_ordinal);
 }
 
 void CopyNTPOrdinals(Profile* source, Profile* destination, int index) {
   SetPageOrdinalForApp(destination, index, GetPageOrdinalForApp(source, index));
   SetAppLaunchOrdinalForApp(
       destination, index, GetAppLaunchOrdinalForApp(source, index));
 }
 
 void FixNTPOrdinalCollisions(Profile* profile) {
   SyncAppHelper::GetInstance()->FixNTPOrdinalCollisions(profile);
 }
 
 }  // namespace apps_helper