[Sync] Generalize StringOrdinal to handle ordinal_in_parent field

chrome/browser/extensions/app_sync_data_unittest.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/extensions/app_sync_data.h"
 
+#include "sync/api/string_ordinal.h"
 #include "sync/protocol/app_specifics.pb.h"
 #include "sync/protocol/sync.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 namespace {
 
 const char kValidId[] = "abcdefghijklmnopabcdefghijklmnop";
 const char kName[] = "MyExtension";
@@ skipping 17 matching lines @@
     extension_specifics->set_enabled(false);
     extension_specifics->set_incognito_enabled(true);
     extension_specifics->set_name(kName);
   }
 };
 
 TEST_F(AppSyncDataTest, SyncDataToExtensionSyncDataForApp) {
   sync_pb::EntitySpecifics entity;
   sync_pb::AppSpecifics* app_specifics = entity.mutable_app();
   app_specifics->set_app_launch_ordinal(
-      StringOrdinal::CreateInitialOrdinal().ToString());
+      syncer::StringOrdinal::CreateInitialOrdinal().ToInternalValue());
   app_specifics->set_page_ordinal(
-      StringOrdinal::CreateInitialOrdinal().ToString());
+      syncer::StringOrdinal::CreateInitialOrdinal().ToInternalValue());
   sync_pb::AppNotificationSettings* notif_settings =
       app_specifics->mutable_notification_settings();
   notif_settings->set_oauth_client_id(kOAuthClientId);
   notif_settings->set_disabled(true);
 
   SetRequiredExtensionValues(app_specifics->mutable_extension());
 
   syncer::SyncData sync_data =
       syncer::SyncData::CreateLocalData("sync_tag", "non_unique_title", entity);
 
   AppSyncData app_sync_data(sync_data);
   EXPECT_EQ(app_specifics->app_launch_ordinal(),
-            app_sync_data.app_launch_ordinal().ToString());
+            app_sync_data.app_launch_ordinal().ToInternalValue());
   EXPECT_EQ(app_specifics->page_ordinal(),
-            app_sync_data.page_ordinal().ToString());
+            app_sync_data.page_ordinal().ToInternalValue());
   EXPECT_EQ(notif_settings->oauth_client_id(),
             app_sync_data.notifications_client_id());
   EXPECT_EQ(notif_settings->disabled(),
             app_sync_data.notifications_disabled());
 }
 
 
 
 TEST_F(AppSyncDataTest, ExtensionSyncDataToSyncDataForApp) {
   sync_pb::EntitySpecifics entity;
   sync_pb::AppSpecifics* input_specifics = entity.mutable_app();
   input_specifics->set_app_launch_ordinal(
-      StringOrdinal::CreateInitialOrdinal().ToString());
+      syncer::StringOrdinal::CreateInitialOrdinal().ToInternalValue());
   input_specifics->set_page_ordinal(
-      StringOrdinal::CreateInitialOrdinal().ToString());
+      syncer::StringOrdinal::CreateInitialOrdinal().ToInternalValue());
   sync_pb::AppNotificationSettings* notif_settings =
       input_specifics->mutable_notification_settings();
   notif_settings->set_oauth_client_id(kOAuthClientId);
   notif_settings->set_disabled(true);
 
   SetRequiredExtensionValues(input_specifics->mutable_extension());
 
   syncer::SyncData sync_data =
       syncer::SyncData::CreateLocalData("sync_tag", "non_unique_title", entity);
   AppSyncData app_sync_data(sync_data);
@@ skipping 23 matching lines @@
 
   syncer::SyncData sync_data =
       syncer::SyncData::CreateLocalData("sync_tag", "non_unique_title", entity);
 
   // There should be no issue loading the sync data.
   AppSyncData app_sync_data(sync_data);
   app_sync_data.GetSyncData();
 }
 
 }  // namespace extensions