[Sync] Generalize StringOrdinal to handle ordinal_in_parent field

Rename StringOrdinal to Ordinal, move it to sync/, and templatize it.
Make StringOrdinal be an instantiation of Ordinal that matches its
previous behavior.

Create NodeOrdinal, which is another instantiation of Ordinal for
the ordinal_in_parent field in SyncEntity.

Rework Ordinal to handle arbitrary byte ranges and to simplify the
interpolation code a bit.

Generalize StringOrdinal unit tests for Ordinal.

Update users of StringOrdinal to prepend syncer::.

BUG=145412
TBR=estade@chromium.org,jianli@chromium.org,brettw@chromium.org, 

Review URL: https://chromiumcodereview.appspot.com/10920017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155368 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/extensions/app_sync_data.h b/chrome/browser/extensions/app_sync_data.h
index 455c64c..7e8d0a4 100644
--- a/chrome/browser/extensions/app_sync_data.h
+++ b/chrome/browser/extensions/app_sync_data.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_EXTENSIONS_APP_SYNC_DATA_H_
 
 #include "chrome/browser/extensions/extension_sync_data.h"
-#include "chrome/common/string_ordinal.h"
+#include "sync/api/string_ordinal.h"
 #include "sync/api/sync_change.h"
 
 namespace syncer {
@@ -33,8 +33,8 @@ class AppSyncData {
               bool incognito_enabled,
               const std::string& notifications_client_id,
               bool notifications_disabled,
-              const StringOrdinal& app_launch_ordinal,
-              const StringOrdinal& page_ordinal);
+              const syncer::StringOrdinal& app_launch_ordinal,
+              const syncer::StringOrdinal& page_ordinal);
   ~AppSyncData();
 
   // Retrive sync data from this class.
@@ -56,10 +56,10 @@ class AppSyncData {
 
   // These ordinals aren't necessarily valid. Some applications don't have
   // valid ordinals because they don't appear on the new tab page.
-  const StringOrdinal& app_launch_ordinal() const {
+  const syncer::StringOrdinal& app_launch_ordinal() const {
     return app_launch_ordinal_;
   }
-  const StringOrdinal& page_ordinal() const { return page_ordinal_; }
+  const syncer::StringOrdinal& page_ordinal() const { return page_ordinal_; }
 
   const ExtensionSyncData& extension_sync_data() const {
     return extension_sync_data_;
@@ -77,8 +77,8 @@ class AppSyncData {
   ExtensionSyncData extension_sync_data_;
   std::string notifications_client_id_;
   bool notifications_disabled_;
-  StringOrdinal app_launch_ordinal_;
-  StringOrdinal page_ordinal_;
+  syncer::StringOrdinal app_launch_ordinal_;
+  syncer::StringOrdinal page_ordinal_;
 };
 
 }  // namespace extensions