diff options
| author | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-03 21:20:54 +0000 |
|---|---|---|
| committer | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-03 21:20:54 +0000 |
| commit | ba85740ffef8b4622d7fc94c71672cc207b4365c (patch) | |
| tree | dd7de7ac6903ec690e15dd9090bce3e01bf9f7c8 /sync/test | |
| parent | ad554bcfe7ea960662f05fbd61c6aadcf71c04bf (diff) | |
| download | chromium_src-ba85740ffef8b4622d7fc94c71672cc207b4365c.zip chromium_src-ba85740ffef8b4622d7fc94c71672cc207b4365c.tar.gz chromium_src-ba85740ffef8b4622d7fc94c71672cc207b4365c.tar.bz2 | |
sync: Remove ModelTypeInvalidationMap
Removes the definition and all uses of ModelTypeInvalidationMap.
The ModelTypeInvalidationMap was useful only for sync-related
invalidations. Its existence made sense when sync was the only client
for invalidations. Now that we have many invalidations clients, it
makes sense to replace it with the more generic ObjectIdInvalidationMap.
The reason for doing this now is that the ObjectIdInvalidationMap will
soon be modified to be incompatible with the current definition of
ModelTypeInvalidationMap. In order to support trickles it will be
modified to allow it to contain several invalidations per ObjectId.
Although it would have been possible to maintain compatibility by making
a corresponding modification to ModelTypeInvalidationMap, there's really
no point in having two invalidation map types. In the long run, it
makes more sense to deprecate ModelTypeInvalidationMap.
BUG=233437
Review URL: https://chromiumcodereview.appspot.com/23238005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/test')
| -rw-r--r-- | sync/test/engine/fake_sync_scheduler.cc | 2 | ||||
| -rw-r--r-- | sync/test/engine/fake_sync_scheduler.h | 2 | ||||
| -rw-r--r-- | sync/test/engine/mock_connection_manager.h | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/sync/test/engine/fake_sync_scheduler.cc b/sync/test/engine/fake_sync_scheduler.cc index 585248e..1e0c7e8 100644 --- a/sync/test/engine/fake_sync_scheduler.cc +++ b/sync/test/engine/fake_sync_scheduler.cc @@ -30,7 +30,7 @@ void FakeSyncScheduler::ScheduleLocalRefreshRequest( void FakeSyncScheduler::ScheduleInvalidationNudge( const base::TimeDelta& desired_delay, - const ModelTypeInvalidationMap& invalidation_map, + const ObjectIdInvalidationMap& invalidation_map, const tracked_objects::Location& nudge_location) { } diff --git a/sync/test/engine/fake_sync_scheduler.h b/sync/test/engine/fake_sync_scheduler.h index 29757e2..11a63cc 100644 --- a/sync/test/engine/fake_sync_scheduler.h +++ b/sync/test/engine/fake_sync_scheduler.h @@ -31,7 +31,7 @@ class FakeSyncScheduler : public SyncScheduler { const tracked_objects::Location& nudge_location) OVERRIDE; virtual void ScheduleInvalidationNudge( const base::TimeDelta& desired_delay, - const ModelTypeInvalidationMap& invalidation_map, + const ObjectIdInvalidationMap& invalidation_map, const tracked_objects::Location& nudge_location) OVERRIDE; virtual bool ScheduleConfiguration( const ConfigurationParams& params) OVERRIDE; diff --git a/sync/test/engine/mock_connection_manager.h b/sync/test/engine/mock_connection_manager.h index bab81ae..83de59a 100644 --- a/sync/test/engine/mock_connection_manager.h +++ b/sync/test/engine/mock_connection_manager.h @@ -17,7 +17,6 @@ #include "base/memory/scoped_vector.h" #include "sync/engine/net/server_connection_manager.h" #include "sync/internal_api/public/base/model_type.h" -#include "sync/internal_api/public/base/model_type_invalidation_map.h" #include "sync/internal_api/public/base/unique_position.h" #include "sync/protocol/sync.pb.h" |