summaryrefslogtreecommitdiff
path: root/chromium/sync/sync_tests.gypi
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2013-12-11 21:33:03 +0100
committerAndras Becsi <andras.becsi@digia.com>2013-12-13 12:34:07 +0100
commitf2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch)
tree0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/sync/sync_tests.gypi
parent5362912cdb5eea702b68ebe23702468d17c3017a (diff)
downloadqtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/sync/sync_tests.gypi')
-rw-r--r--chromium/sync/sync_tests.gypi14
1 files changed, 6 insertions, 8 deletions
diff --git a/chromium/sync/sync_tests.gypi b/chromium/sync/sync_tests.gypi
index 933ad7bfe1d..93d6ed8f753 100644
--- a/chromium/sync/sync_tests.gypi
+++ b/chromium/sync/sync_tests.gypi
@@ -27,6 +27,8 @@
'sync',
],
'sources': [
+ 'internal_api/public/base/model_type_test_util.cc',
+ 'internal_api/public/base/model_type_test_util.h',
'js/js_test_util.cc',
'js/js_test_util.h',
'sessions/test_util.cc',
@@ -47,10 +49,8 @@
'test/engine/test_syncable_utils.h',
'test/fake_encryptor.cc',
'test/fake_encryptor.h',
- 'test/fake_sync_encryption_handler.h',
'test/fake_sync_encryption_handler.cc',
- 'test/test_transaction_observer.cc',
- 'test/test_transaction_observer.h',
+ 'test/fake_sync_encryption_handler.h',
'test/null_directory_change_delegate.cc',
'test/null_directory_change_delegate.h',
'test/null_transaction_observer.cc',
@@ -58,6 +58,8 @@
'test/sessions/test_scoped_session_event_listener.h',
'test/test_directory_backing_store.cc',
'test/test_directory_backing_store.h',
+ 'test/test_transaction_observer.cc',
+ 'test/test_transaction_observer.h',
'util/test_unrecoverable_error_handler.cc',
'util/test_unrecoverable_error_handler.h',
],
@@ -147,10 +149,6 @@
'sources': [
'internal_api/public/base/invalidation_test_util.cc',
'internal_api/public/base/invalidation_test_util.h',
- 'internal_api/public/base/model_type_invalidation_map_test_util.cc',
- 'internal_api/public/base/model_type_invalidation_map_test_util.h',
- 'internal_api/public/base/model_type_test_util.cc',
- 'internal_api/public/base/model_type_test_util.h',
'internal_api/public/test/fake_sync_manager.h',
'internal_api/public/test/test_entry_factory.h',
'internal_api/public/test/test_internal_components_factory.h',
@@ -228,8 +226,8 @@
'..',
],
'sources': [
+ 'internal_api/public/base/cancelation_signal_unittest.cc',
'internal_api/public/base/enum_set_unittest.cc',
- 'internal_api/public/base/model_type_invalidation_map_unittest.cc',
'internal_api/public/base/node_ordinal_unittest.cc',
'internal_api/public/base/ordinal_unittest.cc',
'internal_api/public/base/unique_position_unittest.cc',