summaryrefslogtreecommitdiff
path: root/chromium/components/sync
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/components/sync')
-rw-r--r--chromium/components/sync/BUILD.gn47
-rw-r--r--chromium/components/sync/android/BUILD.gn2
-rw-r--r--chromium/components/sync/base/ordinal.h12
-rw-r--r--chromium/components/sync/protocol/protocol_sources.gni1
4 files changed, 16 insertions, 46 deletions
diff --git a/chromium/components/sync/BUILD.gn b/chromium/components/sync/BUILD.gn
index db5a9d0154d..8ee5e2d2c0c 100644
--- a/chromium/components/sync/BUILD.gn
+++ b/chromium/components/sync/BUILD.gn
@@ -59,6 +59,8 @@ jumbo_static_library("rest_of_sync") {
"engine/events/protocol_event.h",
"engine/events/protocol_event_observer.cc",
"engine/events/protocol_event_observer.h",
+ "engine/forwarding_model_type_processor.cc",
+ "engine/forwarding_model_type_processor.h",
"engine/model_safe_worker.cc",
"engine/model_safe_worker.h",
"engine/model_type_configurer.cc",
@@ -105,8 +107,6 @@ jumbo_static_library("rest_of_sync") {
"engine/sync_string_conversions.h",
"engine_impl/all_status.cc",
"engine_impl/all_status.h",
- "engine_impl/apply_control_data_updates.cc",
- "engine_impl/apply_control_data_updates.h",
"engine_impl/backoff_delay_provider.cc",
"engine_impl/backoff_delay_provider.h",
"engine_impl/bookmark_update_preprocessing.cc",
@@ -121,17 +121,11 @@ jumbo_static_library("rest_of_sync") {
"engine_impl/commit_processor.h",
"engine_impl/commit_util.cc",
"engine_impl/commit_util.h",
- "engine_impl/conflict_resolver.cc",
- "engine_impl/conflict_resolver.h",
- "engine_impl/conflict_util.cc",
- "engine_impl/conflict_util.h",
"engine_impl/cycle/data_type_debug_info_emitter.cc",
"engine_impl/cycle/data_type_debug_info_emitter.h",
"engine_impl/cycle/data_type_tracker.cc",
"engine_impl/cycle/data_type_tracker.h",
"engine_impl/cycle/debug_info_getter.h",
- "engine_impl/cycle/directory_type_debug_info_emitter.cc",
- "engine_impl/cycle/directory_type_debug_info_emitter.h",
"engine_impl/cycle/non_blocking_type_debug_info_emitter.cc",
"engine_impl/cycle/non_blocking_type_debug_info_emitter.h",
"engine_impl/cycle/nudge_tracker.cc",
@@ -144,12 +138,6 @@ jumbo_static_library("rest_of_sync") {
"engine_impl/cycle/sync_cycle_context.h",
"engine_impl/debug_info_event_listener.cc",
"engine_impl/debug_info_event_listener.h",
- "engine_impl/directory_commit_contribution.cc",
- "engine_impl/directory_commit_contribution.h",
- "engine_impl/directory_commit_contributor.cc",
- "engine_impl/directory_commit_contributor.h",
- "engine_impl/directory_update_handler.cc",
- "engine_impl/directory_update_handler.h",
"engine_impl/events/commit_request_event.cc",
"engine_impl/events/commit_request_event.h",
"engine_impl/events/commit_response_event.cc",
@@ -164,8 +152,6 @@ jumbo_static_library("rest_of_sync") {
"engine_impl/events/poll_get_updates_request_event.h",
"engine_impl/events/protocol_event_buffer.cc",
"engine_impl/events/protocol_event_buffer.h",
- "engine_impl/get_commit_ids.cc",
- "engine_impl/get_commit_ids.h",
"engine_impl/get_updates_delegate.cc",
"engine_impl/get_updates_delegate.h",
"engine_impl/get_updates_processor.cc",
@@ -207,12 +193,8 @@ jumbo_static_library("rest_of_sync") {
"engine_impl/nudge_handler.cc",
"engine_impl/nudge_handler.h",
"engine_impl/nudge_source.h",
- "engine_impl/process_updates_util.cc",
- "engine_impl/process_updates_util.h",
"engine_impl/sync_cycle_event.cc",
"engine_impl/sync_cycle_event.h",
- "engine_impl/sync_encryption_handler_impl.cc",
- "engine_impl/sync_encryption_handler_impl.h",
"engine_impl/sync_engine_event_listener.cc",
"engine_impl/sync_engine_event_listener.h",
"engine_impl/sync_manager_impl.cc",
@@ -226,19 +208,11 @@ jumbo_static_library("rest_of_sync") {
"engine_impl/syncer_proto_util.cc",
"engine_impl/syncer_proto_util.h",
"engine_impl/syncer_types.h",
- "engine_impl/syncer_util.cc",
- "engine_impl/syncer_util.h",
"engine_impl/traffic_logger.cc",
"engine_impl/traffic_logger.h",
- "engine_impl/update_applicator.cc",
- "engine_impl/update_applicator.h",
"engine_impl/update_handler.cc",
"engine_impl/update_handler.h",
- "engine_impl/uss_migrator.cc",
- "engine_impl/uss_migrator.h",
"model/blocking_model_type_store.h",
- "model/change_processor.cc",
- "model/change_processor.h",
"model/conflict_resolution.h",
"model/data_batch.h",
"model/data_type_activation_request.cc",
@@ -250,7 +224,6 @@ jumbo_static_library("rest_of_sync") {
"model/entity_change.h",
"model/entity_data.cc",
"model/entity_data.h",
- "model/local_change_observer.h",
"model/metadata_batch.cc",
"model/metadata_batch.h",
"model/metadata_change_list.h",
@@ -269,7 +242,6 @@ jumbo_static_library("rest_of_sync") {
"model/string_ordinal.h",
"model/sync_change.cc",
"model/sync_change.h",
- "model/sync_change_processor.cc",
"model/sync_change_processor.h",
"model/sync_data.cc",
"model/sync_data.h",
@@ -312,8 +284,6 @@ jumbo_static_library("rest_of_sync") {
"nigori/cryptographer.h",
"nigori/cryptographer_impl.cc",
"nigori/cryptographer_impl.h",
- "nigori/forwarding_model_type_processor.cc",
- "nigori/forwarding_model_type_processor.h",
"nigori/keystore_keys_cryptographer.cc",
"nigori/keystore_keys_cryptographer.h",
"nigori/keystore_keys_handler.h",
@@ -339,6 +309,7 @@ jumbo_static_library("rest_of_sync") {
"syncable/base_node.h",
"syncable/base_transaction.cc",
"syncable/base_transaction.h",
+ "syncable/change_processor.h",
"syncable/change_record.cc",
"syncable/change_record.h",
"syncable/change_reorder_buffer.cc",
@@ -349,8 +320,6 @@ jumbo_static_library("rest_of_sync") {
"syncable/directory_backing_store.cc",
"syncable/directory_backing_store.h",
"syncable/directory_change_delegate.h",
- "syncable/directory_cryptographer.cc",
- "syncable/directory_cryptographer.h",
"syncable/entry.cc",
"syncable/entry.h",
"syncable/entry_kernel.cc",
@@ -518,8 +487,6 @@ static_library("test_support_engine") {
static_library("test_support_model") {
testonly = true
sources = [
- "model/change_processor_mock.cc",
- "model/change_processor_mock.h",
"model/data_type_error_handler_mock.cc",
"model/data_type_error_handler_mock.h",
"model/fake_model_type_change_processor.cc",
@@ -603,15 +570,13 @@ source_set("unit_tests") {
"engine/model_safe_worker_unittest.cc",
"engine/net/http_bridge_unittest.cc",
"engine/sync_backend_registrar_unittest.cc",
- "engine_impl/apply_control_data_updates_unittest.cc",
"engine_impl/backoff_delay_provider_unittest.cc",
"engine_impl/bookmark_update_preprocessing_unittest.cc",
+ "engine_impl/commit_processor_unittest.cc",
"engine_impl/cycle/data_type_debug_info_emitter_unittest.cc",
"engine_impl/cycle/nudge_tracker_unittest.cc",
"engine_impl/cycle/status_controller_unittest.cc",
"engine_impl/debug_info_event_listener_unittest.cc",
- "engine_impl/directory_commit_contribution_unittest.cc",
- "engine_impl/directory_update_handler_unittest.cc",
"engine_impl/events/protocol_event_buffer_unittest.cc",
"engine_impl/get_updates_processor_unittest.cc",
"engine_impl/js_mutation_event_observer_unittest.cc",
@@ -626,13 +591,10 @@ source_set("unit_tests") {
"engine_impl/model_type_worker_unittest.cc",
"engine_impl/net/sync_server_connection_manager_unittest.cc",
"engine_impl/non_blocking_type_commit_contribution_unittest.cc",
- "engine_impl/sync_encryption_handler_impl_unittest.cc",
"engine_impl/sync_manager_impl_unittest.cc",
"engine_impl/sync_scheduler_impl_unittest.cc",
"engine_impl/syncer_proto_util_unittest.cc",
"engine_impl/syncer_unittest.cc",
- "engine_impl/syncer_util_unittest.cc",
- "engine_impl/uss_migrator_unittest.cc",
"js/js_event_details_unittest.cc",
"js/sync_js_controller_unittest.cc",
"model/entity_data_unittest.cc",
@@ -661,7 +623,6 @@ source_set("unit_tests") {
"protocol/proto_value_conversions_unittest.cc",
"syncable/change_record_unittest.cc",
"syncable/directory_backing_store_unittest.cc",
- "syncable/directory_cryptographer_unittest.cc",
"syncable/directory_unittest.cc",
"syncable/directory_unittest.h",
"syncable/entry_kernel_unittest.cc",
diff --git a/chromium/components/sync/android/BUILD.gn b/chromium/components/sync/android/BUILD.gn
index 4575d881584..a3eca7269de 100644
--- a/chromium/components/sync/android/BUILD.gn
+++ b/chromium/components/sync/android/BUILD.gn
@@ -20,7 +20,6 @@ android_library("sync_java") {
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
srcjar_deps = [ ":java_enums" ]
sources = [
- "java/src/org/chromium/components/sync/AndroidSyncSettings.java",
"java/src/org/chromium/components/sync/ModelTypeHelper.java",
"java/src/org/chromium/components/sync/Passphrase.java",
"java/src/org/chromium/components/sync/SyncConstants.java",
@@ -50,7 +49,6 @@ android_library("sync_javatests") {
"//third_party/junit",
]
sources = [
- "javatests/src/org/chromium/components/sync/AndroidSyncSettingsTest.java",
"javatests/src/org/chromium/components/sync/notifier/InvalidationClientNameProviderTest.java",
"javatests/src/org/chromium/components/sync/notifier/InvalidationPreferencesTest.java",
]
diff --git a/chromium/components/sync/base/ordinal.h b/chromium/components/sync/base/ordinal.h
index 9273cd1e66b..5deba3940b7 100644
--- a/chromium/components/sync/base/ordinal.h
+++ b/chromium/components/sync/base/ordinal.h
@@ -11,8 +11,8 @@
#include <cstddef>
#include <string>
+#include "base/check_op.h"
#include "base/json/string_escape.h"
-#include "base/logging.h"
namespace mojo {
template <typename DataViewType, typename T>
@@ -245,6 +245,16 @@ bool Ordinal<Traits>::EqualsFn::operator()(const Ordinal<Traits>& lhs,
}
template <typename Traits>
+bool operator==(const Ordinal<Traits>& lhs, const Ordinal<Traits>& rhs) {
+ return lhs.EqualsOrBothInvalid(rhs);
+}
+
+template <typename Traits>
+bool operator!=(const Ordinal<Traits>& lhs, const Ordinal<Traits>& rhs) {
+ return !(lhs == rhs);
+}
+
+template <typename Traits>
Ordinal<Traits>::Ordinal(const std::string& bytes)
: bytes_(bytes), is_valid_(IsValidOrdinalBytes(bytes_)) {}
diff --git a/chromium/components/sync/protocol/protocol_sources.gni b/chromium/components/sync/protocol/protocol_sources.gni
index fee1d3eb1a0..b3c9ee93be0 100644
--- a/chromium/components/sync/protocol/protocol_sources.gni
+++ b/chromium/components/sync/protocol/protocol_sources.gni
@@ -51,6 +51,7 @@ sync_protocol_bases = [
"sharing_message_specifics",
"sync",
"sync_enums",
+ "sync_invalidations_payload",
"synced_notification_app_info_specifics",
"synced_notification_specifics",
"test",
View Lorry Controller Status