sync: remove UnappliedUpdateMetaHandles and just use std::vector<int64>

BUG=none
TEST=none

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

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

6 files changed, 6 insertions, 8 deletions

diff --git a/sync/engine/apply_updates_command.cc b/sync/engine/apply_updates_command.cc
index ce4f14f..79fd039 100644
--- a/sync/engine/apply_updates_command.cc
+++ b/sync/engine/apply_updates_command.cc
@@ -55,7 +55,7 @@ SyncerError ApplyUpdatesCommand::ModelChangingExecuteImpl(
     }
   }
 
-  syncable::Directory::UnappliedUpdateMetaHandles handles;
+  std::vector<int64> handles;
   dir->GetUnappliedUpdateMetaHandles(
       &trans, server_type_restriction, &handles);
 
diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc
index 1039808..1d8cbb0 100644
--- a/sync/engine/syncer_unittest.cc
+++ b/sync/engine/syncer_unittest.cc
@@ -2485,7 +2485,7 @@ TEST_F(SyncerTest, ParentAndChildBothMatch) {
     EXPECT_EQ(1u, children.size());
     directory()->GetChildHandlesById(&trans, parent_id, &children);
     EXPECT_EQ(1u, children.size());
-    Directory::UnappliedUpdateMetaHandles unapplied;
+    std::vector<int64> unapplied;
     directory()->GetUnappliedUpdateMetaHandles(&trans, all_types, &unapplied);
     EXPECT_EQ(0u, unapplied.size());
     syncable::Directory::UnsyncedMetaHandles unsynced;
diff --git a/sync/engine/update_applicator.h b/sync/engine/update_applicator.h
index 5b3ee18..024ccfa 100644
--- a/sync/engine/update_applicator.h
+++ b/sync/engine/update_applicator.h
@@ -31,8 +31,7 @@ class Cryptographer;
 
 class UpdateApplicator {
  public:
-  typedef syncable::Directory::UnappliedUpdateMetaHandles::iterator
-      UpdateIterator;
+  typedef std::vector<int64>::iterator UpdateIterator;
 
   UpdateApplicator(ConflictResolver* resolver,
                    Cryptographer* cryptographer,
diff --git a/sync/syncable/syncable.cc b/sync/syncable/syncable.cc
index e34aa77..7bf1a58 100644
--- a/sync/syncable/syncable.cc
+++ b/sync/syncable/syncable.cc
@@ -1174,7 +1174,7 @@ FullModelTypeSet Directory::GetServerTypesWithUnappliedUpdates(
 void Directory::GetUnappliedUpdateMetaHandles(
     BaseTransaction* trans,
     FullModelTypeSet server_types,
-    UnappliedUpdateMetaHandles* result) {
+    std::vector<int64>* result) {
   result->clear();
   ScopedKernelLock lock(this);
   for (int i = UNSPECIFIED; i < MODEL_TYPE_COUNT; ++i) {
diff --git a/sync/syncable/syncable.h b/sync/syncable/syncable.h
index 758dcac..5dc323f 100644
--- a/sync/syncable/syncable.h
+++ b/sync/syncable/syncable.h
@@ -1011,10 +1011,9 @@ class Directory {
 
   // Get all the metahandles for unapplied updates for a given set of
   // server types.
-  typedef std::vector<int64> UnappliedUpdateMetaHandles;
   void GetUnappliedUpdateMetaHandles(BaseTransaction* trans,
                                      FullModelTypeSet server_types,
-                                     UnappliedUpdateMetaHandles* result);
+                                     std::vector<int64>* result);
 
   // Checks tree metadata consistency.
   // If full_scan is false, the function will avoid pulling any entries from the
diff --git a/sync/syncable/syncable_unittest.cc b/sync/syncable/syncable_unittest.cc
index 20b6840..c4f8701 100644
--- a/sync/syncable/syncable_unittest.cc
+++ b/sync/syncable/syncable_unittest.cc
@@ -812,7 +812,7 @@ TEST_F(SyncableDirectoryTest, TestGetUnsynced) {
 }
 
 TEST_F(SyncableDirectoryTest, TestGetUnappliedUpdates) {
-  Directory::UnappliedUpdateMetaHandles handles;
+  std::vector<int64> handles;
   int64 handle1, handle2;
   const syncable::FullModelTypeSet all_types =
       syncable::FullModelTypeSet::All();