sync/sync.gyp - Issue 10837214: Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sync/sync.gyp

Issue 10837214: Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix unit test Created 8 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: sync/sync.gyp

diff --git a/sync/sync.gyp b/sync/sync.gyp

index 720a28c69e47847197c039c4ad4e0e0bc292876b..415a3be048ac13895443e8c14e6b62fb2c0d1424 100644

--- a/sync/sync.gyp

+++ b/sync/sync.gyp

@@ -41,9 +41,10 @@

'sources': [

'base/sync_export.h',

'internal_api/public/base/enum_set.h',

+ 'internal_api/public/base/invalidation_state.h',

'internal_api/public/base/model_type.h',

- 'internal_api/public/base/model_type_payload_map.cc',

- 'internal_api/public/base/model_type_payload_map.h',

+ 'internal_api/public/base/model_type_state_map.cc',

+ 'internal_api/public/base/model_type_state_map.h',

'internal_api/public/engine/model_safe_worker.cc',

'internal_api/public/engine/model_safe_worker.h',

'internal_api/public/engine/passive_model_worker.cc',

@@ -256,8 +257,8 @@

'notifier/invalidation_util.h',

'notifier/notifications_disabled_reason.cc',

'notifier/notifications_disabled_reason.h',

- 'notifier/object_id_payload_map.cc',

- 'notifier/object_id_payload_map.h',

+ 'notifier/object_id_state_map.cc',

+ 'notifier/object_id_state_map.h',

'notifier/sync_notifier.h',

'notifier/sync_notifier_factory.cc',

'notifier/sync_notifier_factory.h',

@@ -416,6 +417,10 @@

'sync',

'sources': [

+ 'internal_api/public/base/invalidation_state_test_util.cc',

+ 'internal_api/public/base/invalidation_state_test_util.h',

+ 'internal_api/public/base/model_type_state_map_test_util.cc',

+ 'internal_api/public/base/model_type_state_map_test_util.h',

'internal_api/public/base/model_type_test_util.cc',

'internal_api/public/base/model_type_test_util.h',

'js/js_test_util.cc',

@@ -477,6 +482,8 @@

'notifier/fake_invalidation_state_tracker.h',

'notifier/mock_sync_notifier_observer.cc',

'notifier/mock_sync_notifier_observer.h',

+ 'notifier/object_id_state_map_test_util.cc',

+ 'notifier/object_id_state_map_test_util.h',

@@ -570,7 +577,7 @@

'sources': [

'internal_api/public/base/enum_set_unittest.cc',

- 'internal_api/public/base/model_type_payload_map_unittest.cc',

+ 'internal_api/public/base/model_type_state_map_unittest.cc',

'internal_api/public/engine/model_safe_worker_unittest.cc',

'internal_api/public/util/immutable_unittest.cc',

'engine/apply_updates_command_unittest.cc',

« no previous file with comments | « sync/sessions/sync_session_unittest.cc ('k') | sync/test/engine/fake_sync_scheduler.h » ('j') | no next file with comments »