[Sync] Generalize StringOrdinal to handle ordinal_in_parent field

chrome/browser/sync/test/integration/sync_app_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/sync_app_helper.h"
 
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_sorting.h"
 #include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/extensions/extension_sorting.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/extensions_helper.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_extension_helper.h"
-#include "chrome/common/string_ordinal.h"
 
 namespace {
 
 struct AppState {
   AppState();
   ~AppState();
   bool IsValid() const;
   bool Equals(const AppState& other) const;
 
-  StringOrdinal app_launch_ordinal;
-  StringOrdinal page_ordinal;
+  syncer::StringOrdinal app_launch_ordinal;
+  syncer::StringOrdinal page_ordinal;
 };
 
 typedef std::map<std::string, AppState> AppStateMap;
 
 AppState::AppState() {}
 
 AppState::~AppState() {}
 
 bool AppState::IsValid() const {
   return page_ordinal.IsValid() && app_launch_ordinal.IsValid();
 }
 
 bool AppState::Equals(const AppState& other) const {
-  return app_launch_ordinal.Equal(other.app_launch_ordinal) &&
-      page_ordinal.Equal(other.page_ordinal);
+  return app_launch_ordinal.Equals(other.app_launch_ordinal) &&
+      page_ordinal.Equals(other.page_ordinal);
 }
 
 // Load all the app specific values for |id| into |app_state|.
 void LoadApp(ExtensionService* extension_service,
              const std::string& id,
              AppState* app_state) {
   app_state->app_launch_ordinal = extension_service->extension_prefs()->
       extension_sorting()->GetAppLaunchOrdinal(id);
   app_state->page_ordinal = extension_service->extension_prefs()->
       extension_sorting()->GetPageOrdinal(id);
@@ skipping 84 matching lines @@
                << " do not match profile " << profile2->GetDebugName();
       return false;
     }
     ++it1;
     ++it2;
   }
 
   return true;
 }
 
-StringOrdinal SyncAppHelper::GetPageOrdinalForApp(Profile* profile,
-                                                  const std::string& name) {
+syncer::StringOrdinal SyncAppHelper::GetPageOrdinalForApp(
+    Profile* profile,
+    const std::string& name) {
   return profile->GetExtensionService()->extension_prefs()->
       extension_sorting()->GetPageOrdinal(SyncExtensionHelper::NameToId(name));
 }
 
-void SyncAppHelper::SetPageOrdinalForApp(Profile* profile,
-                                         const std::string& name,
-                                         const StringOrdinal& page_ordinal) {
+void SyncAppHelper::SetPageOrdinalForApp(
+    Profile* profile,
+    const std::string& name,
+    const syncer::StringOrdinal& page_ordinal) {
   profile->GetExtensionService()->extension_prefs()->extension_sorting()->
       SetPageOrdinal(SyncExtensionHelper::NameToId(name), page_ordinal);
 }
 
-StringOrdinal SyncAppHelper::GetAppLaunchOrdinalForApp(
+syncer::StringOrdinal SyncAppHelper::GetAppLaunchOrdinalForApp(
     Profile* profile,
     const std::string& name) {
   return profile->GetExtensionService()->extension_prefs()->
       extension_sorting()->GetAppLaunchOrdinal(
           SyncExtensionHelper::NameToId(name));
 }
 
 void SyncAppHelper::SetAppLaunchOrdinalForApp(
     Profile* profile,
     const std::string& name,
-    const StringOrdinal& app_launch_ordinal) {
+    const syncer::StringOrdinal& app_launch_ordinal) {
   profile->GetExtensionService()->extension_prefs()->extension_sorting()->
       SetAppLaunchOrdinal(SyncExtensionHelper::NameToId(name),
                           app_launch_ordinal);
 }
 
 void SyncAppHelper::FixNTPOrdinalCollisions(Profile* profile) {
   profile->GetExtensionService()->extension_prefs()->extension_sorting()->
       FixNTPOrdinalCollisions();
 }
 
 SyncAppHelper::SyncAppHelper() : setup_completed_(false) {}
 
 SyncAppHelper::~SyncAppHelper() {}