[Sync] Generalize StringOrdinal to handle ordinal_in_parent field

chrome/browser/sync/test/integration/sync_extension_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_extension_helper.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/pending_extension_info.h"
 #include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
-#include "chrome/common/string_ordinal.h"
-#include "chrome/browser/sync/test/integration/sync_test.h"
-#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
+#include "sync/api/string_ordinal.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using extensions::Extension;
 
 SyncExtensionHelper::ExtensionState::ExtensionState()
     : enabled_state(ENABLED), incognito_enabled(false) {}
 
 SyncExtensionHelper::ExtensionState::~ExtensionState() {}
 
 bool SyncExtensionHelper::ExtensionState::Equals(
@@ skipping 33 matching lines @@
 }
 
 std::string SyncExtensionHelper::InstallExtension(
     Profile* profile, const std::string& name, Extension::Type type) {
   scoped_refptr<Extension> extension = GetExtension(profile, name, type);
   if (!extension.get()) {
     NOTREACHED() << "Could not install extension " << name;
     return "";
   }
   profile->GetExtensionService()->OnExtensionInstalled(
-      extension, extension->UpdatesFromGallery(), StringOrdinal());
+      extension, extension->UpdatesFromGallery(), syncer::StringOrdinal());
   return extension->id();
 }
 
 void SyncExtensionHelper::UninstallExtension(
     Profile* profile, const std::string& name) {
   ExtensionService::UninstallExtensionHelper(profile->GetExtensionService(),
                                              NameToId(name));
 }
 
 std::vector<std::string> SyncExtensionHelper::GetInstalledExtensionNames(
@@ skipping 262 matching lines @@
   if (extension->id() != expected_id) {
     EXPECT_EQ(expected_id, extension->id());
     return NULL;
   }
   DVLOG(2) << "created extension with name = "
            << name << ", id = " << expected_id;
   (it->second)[name] = extension;
   id_to_name_[expected_id] = name;
   return extension;
 }