[Sync] Generalize StringOrdinal to handle ordinal_in_parent field

chrome/browser/media_gallery/media_galleries_preferences_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.
 
 // MediaGalleriesPreferences unit tests.
 
 #include "chrome/browser/media_gallery/media_galleries_preferences.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/media_gallery/media_file_system_registry.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
+#include "sync/api/string_ordinal.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chrome {
 
 namespace {
 
 class TestMediaGalleriesPreferences : public MediaGalleriesPreferences {
  public:
   static string16 GetDisplayNameForPath(const FilePath& path) {
     return MediaGalleriesPreferences::ComputeDisplayName(path);
@@ skipping 164 matching lines @@
                                       &errors);
     EXPECT_TRUE(extension.get() != NULL) << errors;
     EXPECT_TRUE(extensions::Extension::IdIsValid(extension->id()));
     if (!extension.get() ||
         !extensions::Extension::IdIsValid(extension->id())) {
       return NULL;
     }
 
     extension_service_->extension_prefs()->OnExtensionInstalled(
         extension, extensions::Extension::ENABLED, false,
-        StringOrdinal::CreateInitialOrdinal());
+        syncer::StringOrdinal::CreateInitialOrdinal());
 
     return extension;
   }
 
   // Needed for extension service & friends to work.
   MessageLoop loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 
   scoped_ptr<TestingProfile> profile_;
@@ skipping 272 matching lines @@
   // Check that adding one of them again works as expected.
   MediaGalleryPrefId id = gallery_prefs()->AddGallery(
       device_id, ASCIIToUTF16("Device2Path2"), path, true /*user*/);
   EXPECT_EQ(dev2_path2_id, id);
   Verify();
 }
 
 }  // namespace
 
 }  // namespace chrome