diff options
author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-04 17:33:39 +0000 |
---|---|---|
committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-04 17:33:39 +0000 |
commit | fbb9d2db1796934769f1c3b1a0f1c4e86db5b046 (patch) | |
tree | 050405cc5659922885be3c0e4e98fa4ef02de1a9 /sync/syncable | |
parent | 8ef43eae22ccd93174cb1b5a1c55085208d034de (diff) | |
download | chromium_src-fbb9d2db1796934769f1c3b1a0f1c4e86db5b046.zip chromium_src-fbb9d2db1796934769f1c3b1a0f1c4e86db5b046.tar.gz chromium_src-fbb9d2db1796934769f1c3b1a0f1c4e86db5b046.tar.bz2 |
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
Diffstat (limited to 'sync/syncable')
-rw-r--r-- | sync/syncable/syncable.cc | 2 | ||||
-rw-r--r-- | sync/syncable/syncable.h | 3 | ||||
-rw-r--r-- | sync/syncable/syncable_unittest.cc | 2 |
3 files changed, 3 insertions, 4 deletions
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(); |