[Sync Model/Engine split] Merge {model,engine}_impl with {model,engine}

The distinction between the impl and non-impl directories has become
unclear over time, as well as the dependencies between them. This CL
merges them. This will allow us to create separate build targets for
engine/ and model/ (model/ depends on engine/). Subdirectories are
merged correspondingly, e.g. engine_impl/cycle/ is merged with
engine/cycle/.

Orthogonal to this, we remove 1 unnecessary engine/ dependency from
components/password_manager/core/browser/DEPS, and make some net/
dependencies more specific in sync/ DEPS.

TBR=sky@chromium.org

Bug: 947443
Change-Id: Iedc11931d1c1d2c126186679a906b88984a8d27d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2659120
Commit-Queue: Victor Vianna <victorvianna@google.com>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#849112}

chrome/browser/chromeos/printing/printers_sync_bridge.cc

@@ -15,9 +15,9 @@
 #include "chrome/browser/chromeos/printing/specifics_translation.h"
 #include "chromeos/printing/printer_configuration.h"
 #include "components/sync/base/report_unrecoverable_error.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
 #include "components/sync/model/model_type_change_processor.h"
 #include "components/sync/model/mutable_data_batch.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
 #include "components/sync/protocol/model_type_state.pb.h"
 #include "components/sync/protocol/sync.pb.h"
 

chrome/browser/chromeos/sync/apps_model_type_controller.cc

@@ -12,9 +12,9 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chromeos/constants/chromeos_features.h"
 #include "components/sync/base/model_type.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
-#include "components/sync/model_impl/forwarding_model_type_controller_delegate.h"
-#include "components/sync/model_impl/syncable_service_based_bridge.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
+#include "components/sync/model/forwarding_model_type_controller_delegate.h"
+#include "components/sync/model/syncable_service_based_bridge.h"
 #include "extensions/browser/extension_system.h"
 
 using syncer::ClientTagBasedModelTypeProcessor;

chrome/browser/chromeos/sync/os_syncable_service_model_type_controller.cc

@@ -15,10 +15,10 @@
 #include "components/sync/base/model_type.h"
 #include "components/sync/base/pref_names.h"
 #include "components/sync/driver/sync_service.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
+#include "components/sync/model/forwarding_model_type_controller_delegate.h"
 #include "components/sync/model/model_type_controller_delegate.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
-#include "components/sync/model_impl/forwarding_model_type_controller_delegate.h"
-#include "components/sync/model_impl/syncable_service_based_bridge.h"
+#include "components/sync/model/syncable_service_based_bridge.h"
 
 using syncer::ClientTagBasedModelTypeProcessor;
 using syncer::ForwardingModelTypeControllerDelegate;

chrome/browser/consent_auditor/consent_auditor_factory.cc

@@ -22,8 +22,8 @@
 #include "components/prefs/pref_service.h"
 #include "components/sync/base/report_unrecoverable_error.h"
 #include "components/sync/driver/sync_driver_switches.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
 #include "components/sync/model/model_type_store_service.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
 #include "components/version_info/version_info.h"
 
 // static

chrome/browser/security_events/security_event_recorder_factory.cc

@@ -17,8 +17,8 @@
 #include "chrome/common/channel_info.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/sync/base/report_unrecoverable_error.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
 #include "components/sync/model/model_type_store_service.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
 
 // static
 SecurityEventRecorderFactory* SecurityEventRecorderFactory::GetInstance() {

chrome/browser/sharing/sharing_message_bridge_factory.cc

@@ -9,7 +9,7 @@
 #include "chrome/common/channel_info.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/sync/base/report_unrecoverable_error.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
 
 namespace {
 constexpr char kServiceName[] = "SharingMessageBridge";

chrome/browser/sharing/sharing_message_bridge_impl.cc

@@ -7,9 +7,9 @@
 #include "base/guid.h"
 #include "base/metrics/histogram_functions.h"
 #include "chrome/browser/sharing/features.h"
+#include "components/sync/model/dummy_metadata_change_list.h"
 #include "components/sync/model/metadata_batch.h"
 #include "components/sync/model/mutable_data_batch.h"
-#include "components/sync/model_impl/dummy_metadata_change_list.h"
 #include "net/base/network_change_notifier.h"
 
 namespace {

chrome/browser/sync/chrome_sync_client.cc

@@ -82,9 +82,9 @@
 #include "components/sync/driver/sync_api_component_factory.h"
 #include "components/sync/driver/sync_driver_switches.h"
 #include "components/sync/driver/syncable_service_based_model_type_controller.h"
+#include "components/sync/model/forwarding_model_type_controller_delegate.h"
 #include "components/sync/model/model_type_store.h"
 #include "components/sync/model/model_type_store_service.h"
-#include "components/sync/model_impl/forwarding_model_type_controller_delegate.h"
 #include "components/sync/trusted_vault/standalone_trusted_vault_client.h"
 #include "components/sync_bookmarks/bookmark_sync_service.h"
 #include "components/sync_preferences/pref_service_syncable.h"

chrome/browser/sync/model_type_store_service_factory.cc

@@ -7,7 +7,7 @@
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
-#include "components/sync/model_impl/model_type_store_service_impl.h"
+#include "components/sync/model/model_type_store_service_impl.h"
 
 // static
 ModelTypeStoreServiceFactory* ModelTypeStoreServiceFactory::GetInstance() {

chrome/browser/sync/test/integration/bookmarks_helper.h

@@ -22,8 +22,8 @@
 #include "components/bookmarks/browser/bookmark_model_observer.h"
 #include "components/bookmarks/browser/bookmark_node.h"
 #include "components/bookmarks/browser/bookmark_test_util.h"
+#include "components/sync/engine/loopback_server/loopback_server_entity.h"
 #include "components/sync/engine/nigori/cryptographer.h"
-#include "components/sync/engine_impl/loopback_server/loopback_server_entity.h"
 #include "components/sync/test/fake_server/fake_server.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/skia/include/core/SkColor.h"

chrome/browser/sync/test/integration/passwords_helper.cc

@@ -25,7 +25,7 @@
 #include "components/password_manager/core/browser/password_manager_test_utils.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "components/password_manager/core/browser/password_store_consumer.h"
-#include "components/sync/engine_impl/loopback_server/persistent_unique_client_entity.h"
+#include "components/sync/engine/loopback_server/persistent_unique_client_entity.h"
 #include "components/sync/nigori/cryptographer_impl.h"
 #include "content/public/test/test_utils.h"
 #include "net/base/escape.h"

chrome/browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc

@@ -9,7 +9,7 @@
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/sync/test/integration/typed_urls_helper.h"
-#include "components/sync/engine_impl/cycle/sync_cycle_context.h"
+#include "components/sync/engine/cycle/sync_cycle_context.h"
 #include "content/public/test/browser_test.h"
 #include "testing/perf/perf_result_reporter.h"
 

chrome/browser/sync/test/integration/profile_sync_service_harness.cc

@@ -26,9 +26,9 @@
 #include "components/signin/public/identity_manager/identity_manager.h"
 #include "components/signin/public/identity_manager/identity_test_utils.h"
 #include "components/sync/driver/sync_internals_util.h"
+#include "components/sync/engine/net/url_translator.h"
 #include "components/sync/engine/sync_string_conversions.h"
-#include "components/sync/engine_impl/net/url_translator.h"
-#include "components/sync/engine_impl/traffic_logger.h"
+#include "components/sync/engine/traffic_logger.h"
 #include "components/sync/protocol/sync.pb.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/test/simple_url_loader_test_helper.h"

chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc

@@ -20,8 +20,8 @@
 #include "components/bookmarks/browser/url_and_title.h"
 #include "components/sync/base/client_tag_hash.h"
 #include "components/sync/driver/profile_sync_service.h"
-#include "components/sync/engine_impl/bookmark_update_preprocessing.h"
-#include "components/sync/engine_impl/loopback_server/loopback_server_entity.h"
+#include "components/sync/engine/bookmark_update_preprocessing.h"
+#include "components/sync/engine/loopback_server/loopback_server_entity.h"
 #include "components/sync/test/fake_server/bookmark_entity_builder.h"
 #include "components/sync/test/fake_server/entity_builder_factory.h"
 #include "components/sync/test/fake_server/fake_server_verifier.h"

chrome/browser/sync/test/integration/single_client_history_delete_directives_sync_test.cc

@@ -15,7 +15,7 @@
 #include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/history_types.h"
-#include "components/sync/engine_impl/loopback_server/persistent_unique_client_entity.h"
+#include "components/sync/engine/loopback_server/persistent_unique_client_entity.h"
 #include "components/sync/protocol/sync.pb.h"
 #include "components/sync/test/fake_server/fake_server.h"
 #include "content/public/test/browser_test.h"

chrome/browser/sync/test/integration/single_client_search_engines_sync_test.cc

@@ -13,8 +13,8 @@
 #include "components/search_engines/template_url_data.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/sync/driver/profile_sync_service.h"
-#include "components/sync/engine_impl/loopback_server/loopback_server_entity.h"
-#include "components/sync/engine_impl/loopback_server/persistent_unique_client_entity.h"
+#include "components/sync/engine/loopback_server/loopback_server_entity.h"
+#include "components/sync/engine/loopback_server/persistent_unique_client_entity.h"
 #include "components/sync/model/sync_data.h"
 #include "content/public/test/browser_test.h"
 #include "testing/gmock/include/gmock/gmock.h"

chrome/browser/sync/test/integration/sync_test.cc

@@ -66,7 +66,7 @@
 #include "components/sync/driver/sync_driver_switches.h"
 #include "components/sync/driver/sync_user_settings.h"
 #include "components/sync/engine/sync_engine_switches.h"
-#include "components/sync/engine_impl/sync_scheduler_impl.h"
+#include "components/sync/engine/sync_scheduler_impl.h"
 #include "components/sync/invalidations/switches.h"
 #include "components/sync/invalidations/sync_invalidations_service_impl.h"
 #include "components/sync/protocol/sync.pb.h"

chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc

@@ -29,7 +29,7 @@
 #include "components/sync/driver/profile_sync_service.h"
 #include "components/sync/driver/sync_service.h"
 #include "components/sync/engine/cycle/sync_cycle_snapshot.h"
-#include "components/sync/engine_impl/loopback_server/persistent_permanent_entity.h"
+#include "components/sync/engine/loopback_server/persistent_permanent_entity.h"
 #include "content/public/test/browser_test.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/browser/sync/user_event_service_factory.cc

@@ -17,8 +17,8 @@
 #include "components/sync/base/model_type.h"
 #include "components/sync/base/report_unrecoverable_error.h"
 #include "components/sync/driver/sync_service.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
 #include "components/sync/model/model_type_store_service.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
 #include "components/sync_sessions/session_sync_service.h"
 #include "components/sync_user_events/no_op_user_event_service.h"
 #include "components/sync_user_events/user_event_service_impl.h"

chrome/browser/ui/app_list/arc/arc_package_sync_model_type_controller.cc

@@ -15,9 +15,9 @@
 #include "components/prefs/pref_service.h"
 #include "components/sync/base/pref_names.h"
 #include "components/sync/driver/sync_service.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
-#include "components/sync/model_impl/forwarding_model_type_controller_delegate.h"
-#include "components/sync/model_impl/syncable_service_based_bridge.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
+#include "components/sync/model/forwarding_model_type_controller_delegate.h"
+#include "components/sync/model/syncable_service_based_bridge.h"
 
 using syncer::ClientTagBasedModelTypeProcessor;
 using syncer::ForwardingModelTypeControllerDelegate;

chrome/browser/ui/read_later/reading_list_model_factory.cc

@@ -26,8 +26,8 @@
 #include "components/reading_list/core/reading_list_pref_names.h"
 #include "components/reading_list/core/reading_list_store.h"
 #include "components/sync/base/report_unrecoverable_error.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
 #include "components/sync/model/model_type_store_service.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 

chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.cc

@@ -18,7 +18,7 @@
 #include "components/sync/engine/commit_and_get_updates_types.h"
 #include "components/sync/engine/entity_data.h"
 #include "components/sync/engine/model_type_processor.h"
-#include "components/sync/model_impl/in_memory_metadata_change_list.h"
+#include "components/sync/model/in_memory_metadata_change_list.h"
 #include "components/sync/protocol/session_specifics.pb.h"
 #include "components/sync_sessions/open_tabs_ui_delegate.h"
 #include "components/sync_sessions/session_store.h"

chrome/browser/ui/views/sharing/sharing_browsertest.cc

@@ -29,7 +29,7 @@
 #include "chrome/browser/ui/views/page_action/page_action_icon_view.h"
 #include "components/gcm_driver/fake_gcm_profile_service.h"
 #include "components/sync/driver/profile_sync_service.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
 #include "components/sync_device_info/device_info.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/dns/mock_host_resolver.h"

chrome/browser/web_applications/web_app_database_factory.cc

@@ -8,7 +8,7 @@
 #include "chrome/browser/sync/model_type_store_service_factory.h"
 #include "chrome/browser/web_applications/components/web_app_utils.h"
 #include "chrome/common/chrome_features.h"
-#include "components/sync/model_impl/model_type_store_service_impl.h"
+#include "components/sync/model/model_type_store_service_impl.h"
 
 namespace web_app {
 

chrome/browser/web_applications/web_app_sync_bridge.cc

@@ -29,11 +29,11 @@
 #include "chrome/common/channel_info.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/base/report_unrecoverable_error.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
 #include "components/sync/model/metadata_batch.h"
 #include "components/sync/model/metadata_change_list.h"
 #include "components/sync/model/model_type_store.h"
 #include "components/sync/model/mutable_data_batch.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
 #include "components/sync/protocol/web_app_specifics.pb.h"
 #include "url/gurl.h"
 

chromeos/components/sync_wifi/wifi_configuration_bridge_unittest.cc

@@ -30,9 +30,9 @@
 #include "components/sync/base/model_type.h"
 #include "components/sync/model/data_batch.h"
 #include "components/sync/model/entity_change.h"
+#include "components/sync/model/in_memory_metadata_change_list.h"
 #include "components/sync/model/metadata_batch.h"
 #include "components/sync/model/model_type_store.h"
-#include "components/sync/model_impl/in_memory_metadata_change_list.h"
 #include "components/sync/protocol/model_type_state.pb.h"
 #include "components/sync/test/model/mock_model_type_change_processor.h"
 #include "components/sync/test/model/model_type_store_test_util.h"

chromeos/components/sync_wifi/wifi_configuration_sync_service.cc

@@ -19,8 +19,8 @@
 #include "chromeos/network/network_metadata_store.h"
 #include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h"
 #include "components/sync/base/report_unrecoverable_error.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
 #include "components/sync/model/model_type_store.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
 
 namespace chromeos {
 

components/autofill/core/browser/webdata/autocomplete_sync_bridge.cc

@@ -19,10 +19,10 @@
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/core/common/autofill_features.h"
 #include "components/sync/engine/entity_data.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
 #include "components/sync/model/model_type_change_processor.h"
 #include "components/sync/model/mutable_data_batch.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
-#include "components/sync/model_impl/sync_metadata_store_change_list.h"
+#include "components/sync/model/sync_metadata_store_change_list.h"
 #include "net/base/escape.h"
 
 using base::Optional;

components/autofill/core/browser/webdata/autocomplete_sync_bridge_unittest.cc

@@ -24,11 +24,11 @@
 #include "components/autofill/core/browser/webdata/autofill_table.h"
 #include "components/autofill/core/browser/webdata/mock_autofill_webdata_backend.h"
 #include "components/sync/base/client_tag_hash.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
 #include "components/sync/model/data_batch.h"
 #include "components/sync/model/data_type_activation_request.h"
 #include "components/sync/model/metadata_batch.h"
 #include "components/sync/model/model_error.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
 #include "components/sync/test/model/mock_model_type_change_processor.h"
 #include "components/sync/test/test_matchers.h"
 #include "components/webdata/common/web_database.h"

components/autofill/core/browser/webdata/autofill_profile_sync_bridge.cc

@@ -22,12 +22,12 @@
 #include "components/autofill/core/browser/webdata/autofill_table.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/sync/engine/entity_data.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
 #include "components/sync/model/metadata_change_list.h"
 #include "components/sync/model/model_error.h"
 #include "components/sync/model/model_type_change_processor.h"
 #include "components/sync/model/mutable_data_batch.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
-#include "components/sync/model_impl/sync_metadata_store_change_list.h"
+#include "components/sync/model/sync_metadata_store_change_list.h"
 
 using base::Optional;
 using base::UTF16ToUTF8;

components/autofill/core/browser/webdata/autofill_profile_sync_bridge_unittest.cc

@@ -33,11 +33,11 @@
 #include "components/autofill/core/common/autofill_features.h"
 #include "components/sync/base/client_tag_hash.h"
 #include "components/sync/engine/entity_data.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
 #include "components/sync/model/data_batch.h"
 #include "components/sync/model/data_type_activation_request.h"
 #include "components/sync/model/sync_data.h"
 #include "components/sync/model/sync_error_factory.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
 #include "components/sync/protocol/sync.pb.h"
 #include "components/sync/test/model/mock_model_type_change_processor.h"
 #include "components/sync/test/model/sync_error_factory_mock.h"

components/autofill/core/browser/webdata/autofill_wallet_metadata_sync_bridge.cc

@@ -24,9 +24,9 @@
 #include "components/autofill/core/common/autofill_clock.h"
 #include "components/autofill/core/common/autofill_util.h"
 #include "components/sync/engine/entity_data.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
 #include "components/sync/model/mutable_data_batch.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
-#include "components/sync/model_impl/sync_metadata_store_change_list.h"
+#include "components/sync/model/sync_metadata_store_change_list.h"
 
 namespace autofill {
 

components/autofill/core/browser/webdata/autofill_wallet_metadata_sync_bridge_unittest.cc

@@ -31,8 +31,8 @@
 #include "components/autofill/core/common/autofill_constants.h"
 #include "components/sync/base/client_tag_hash.h"
 #include "components/sync/engine/entity_data.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
 #include "components/sync/model/data_batch.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
 #include "components/sync/protocol/sync.pb.h"
 #include "components/sync/test/model/mock_model_type_change_processor.h"
 #include "components/webdata/common/web_database.h"

components/autofill/core/browser/webdata/autofill_wallet_offer_sync_bridge.cc

@@ -15,9 +15,9 @@
 #include "components/autofill/core/browser/webdata/autofill_webdata_backend.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/sync/base/hash_util.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
 #include "components/sync/model/mutable_data_batch.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
-#include "components/sync/model_impl/sync_metadata_store_change_list.h"
+#include "components/sync/model/sync_metadata_store_change_list.h"
 
 namespace autofill {
 

components/autofill/core/browser/webdata/autofill_wallet_offer_sync_bridge_unittest.cc

@@ -26,9 +26,9 @@
 #include "components/autofill/core/common/autofill_constants.h"
 #include "components/sync/base/hash_util.h"
 #include "components/sync/engine/entity_data.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
+#include "components/sync/model/in_memory_metadata_change_list.h"
 #include "components/sync/model/sync_data.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
-#include "components/sync/model_impl/in_memory_metadata_change_list.h"
 #include "components/sync/protocol/autofill_specifics.pb.h"
 #include "components/sync/protocol/sync.pb.h"
 #include "components/sync/test/model/mock_model_type_change_processor.h"

components/autofill/core/browser/webdata/autofill_wallet_sync_bridge.cc

@@ -26,9 +26,9 @@
 #include "components/sync/base/hash_util.h"
 #include "components/sync/driver/sync_driver_switches.h"
 #include "components/sync/engine/entity_data.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
 #include "components/sync/model/mutable_data_batch.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
-#include "components/sync/model_impl/sync_metadata_store_change_list.h"
+#include "components/sync/model/sync_metadata_store_change_list.h"
 
 using sync_pb::AutofillWalletSpecifics;
 using syncer::EntityData;

components/autofill/core/browser/webdata/autofill_wallet_sync_bridge_unittest.cc

@@ -35,9 +35,9 @@
 #include "components/sync/base/client_tag_hash.h"
 #include "components/sync/driver/sync_driver_switches.h"
 #include "components/sync/engine/entity_data.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
+#include "components/sync/model/in_memory_metadata_change_list.h"
 #include "components/sync/model/sync_data.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
-#include "components/sync/model_impl/in_memory_metadata_change_list.h"
 #include "components/sync/protocol/autofill_specifics.pb.h"
 #include "components/sync/protocol/sync.pb.h"
 #include "components/sync/test/model/mock_model_type_change_processor.h"

components/browser_sync/profile_sync_components_factory_impl.cc

@@ -43,9 +43,9 @@
 #include "components/sync/driver/syncable_service_based_model_type_controller.h"
 #include "components/sync/engine/sync_engine.h"
 #include "components/sync/invalidations/sync_invalidations_service.h"
+#include "components/sync/model/forwarding_model_type_controller_delegate.h"
 #include "components/sync/model/model_type_store_service.h"
-#include "components/sync/model_impl/forwarding_model_type_controller_delegate.h"
-#include "components/sync/model_impl/proxy_model_type_controller_delegate.h"
+#include "components/sync/model/proxy_model_type_controller_delegate.h"
 #include "components/sync_bookmarks/bookmark_sync_service.h"
 #include "components/sync_device_info/device_info_sync_service.h"
 #include "components/sync_preferences/pref_service_syncable.h"

components/history/core/browser/history_backend.cc

@@ -46,7 +46,7 @@
 #include "components/history/core/browser/page_usage_data.h"
 #include "components/history/core/browser/sync/typed_url_sync_bridge.h"
 #include "components/history/core/browser/url_utils.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
 #include "components/url_formatter/url_formatter.h"
 #include "net/base/escape.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"

components/history/core/browser/history_service.cc

@@ -49,8 +49,8 @@
 #include "components/history/core/browser/visit_delegate.h"
 #include "components/history/core/browser/web_history_service.h"
 #include "components/history/core/common/thumbnail_score.h"
+#include "components/sync/model/proxy_model_type_controller_delegate.h"
 #include "components/sync/model/sync_error_factory.h"
-#include "components/sync/model_impl/proxy_model_type_controller_delegate.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/page_transition_types.h"
 

components/history/core/browser/sync/typed_url_sync_bridge.cc

@@ -11,7 +11,7 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/sync/model/mutable_data_batch.h"
-#include "components/sync/model_impl/sync_metadata_store_change_list.h"
+#include "components/sync/model/sync_metadata_store_change_list.h"
 #include "net/base/url_util.h"
 
 using sync_pb::TypedUrlSpecifics;

components/metrics/demographics/demographic_metrics_test_utils.cc

@@ -9,7 +9,7 @@
 #include "base/time/default_tick_clock.h"
 #include "components/metrics/demographics/user_demographics.h"
 #include "components/metrics/log_decoder.h"
-#include "components/sync/engine_impl/loopback_server/persistent_unique_client_entity.h"
+#include "components/sync/engine/loopback_server/persistent_unique_client_entity.h"
 #include "components/sync/protocol/sync.pb.h"
 #include "third_party/metrics_proto/chrome_user_metrics_extension.pb.h"
 

components/password_manager/core/browser/DEPS

@@ -11,8 +11,7 @@ include_rules = [
   "+components/signin/public",
   "+components/sync/base",
   "+components/sync/driver",
-  "+components/sync/engine",
-  "+components/sync/model_impl",
+  "+components/sync/model",
   "+components/sync/test",
   "+components/sync_preferences",
   "+components/ukm",

components/password_manager/core/browser/password_store.cc

@@ -44,8 +44,8 @@
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/safe_browsing/core/common/safe_browsing_prefs.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
-#include "components/sync/model_impl/proxy_model_type_controller_delegate.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
+#include "components/sync/model/proxy_model_type_controller_delegate.h"
 
 namespace password_manager {
 

components/password_manager/core/browser/sync/password_sync_bridge.cc

@@ -19,12 +19,12 @@
 #include "components/password_manager/core/browser/password_form.h"
 #include "components/password_manager/core/browser/password_manager_metrics_util.h"
 #include "components/password_manager/core/common/password_manager_features.h"
+#include "components/sync/model/in_memory_metadata_change_list.h"
 #include "components/sync/model/metadata_batch.h"
 #include "components/sync/model/metadata_change_list.h"
 #include "components/sync/model/model_type_change_processor.h"
 #include "components/sync/model/mutable_data_batch.h"
-#include "components/sync/model_impl/in_memory_metadata_change_list.h"
-#include "components/sync/model_impl/sync_metadata_store_change_list.h"
+#include "components/sync/model/sync_metadata_store_change_list.h"
 #include "net/base/escape.h"
 #include "url/gurl.h"
 

components/password_manager/core/browser/sync/password_sync_bridge_unittest.cc

@@ -24,9 +24,9 @@
 #include "components/sync/base/client_tag_hash.h"
 #include "components/sync/model/data_batch.h"
 #include "components/sync/model/entity_change.h"
+#include "components/sync/model/in_memory_metadata_change_list.h"
 #include "components/sync/model/metadata_batch.h"
-#include "components/sync/model_impl/in_memory_metadata_change_list.h"
-#include "components/sync/model_impl/sync_metadata_store_change_list.h"
+#include "components/sync/model/sync_metadata_store_change_list.h"
 #include "components/sync/test/model/mock_model_type_change_processor.h"
 #include "components/sync/test/test_matchers.h"
 #include "testing/gmock/include/gmock/gmock.h"

components/send_tab_to_self/send_tab_to_self_bridge_unittest.cc

@@ -19,8 +19,8 @@
 #include "components/send_tab_to_self/target_device_info.h"
 #include "components/sync/engine/entity_data.h"
 #include "components/sync/model/entity_change.h"
+#include "components/sync/model/in_memory_metadata_change_list.h"
 #include "components/sync/model/metadata_batch.h"
-#include "components/sync/model_impl/in_memory_metadata_change_list.h"
 #include "components/sync/protocol/model_type_state.pb.h"
 #include "components/sync/test/model/mock_model_type_change_processor.h"
 #include "components/sync/test/model/model_type_store_test_util.h"

components/send_tab_to_self/send_tab_to_self_sync_service.cc

@@ -12,8 +12,8 @@
 #include "components/send_tab_to_self/send_tab_to_self_bridge.h"
 #include "components/send_tab_to_self/send_tab_to_self_model.h"
 #include "components/sync/base/report_unrecoverable_error.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
 #include "components/sync/model/model_type_store.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
 #include "components/sync_device_info/device_info_tracker.h"
 
 namespace send_tab_to_self {

components/sync/BUILD.gn

@@ -31,18 +31,51 @@ group("test_support") {
 # etc, but currently they all depend on each other.
 static_library("rest_of_sync") {
   sources = [
+    "engine/all_status.cc",
+    "engine/all_status.h",
+    "engine/backoff_delay_provider.cc",
+    "engine/backoff_delay_provider.h",
+    "engine/bookmark_update_preprocessing.cc",
+    "engine/bookmark_update_preprocessing.h",
+    "engine/cancelation_signal.cc",
+    "engine/cancelation_signal.h",
+    "engine/commit.cc",
+    "engine/commit.h",
     "engine/commit_and_get_updates_types.cc",
     "engine/commit_and_get_updates_types.h",
+    "engine/commit_contribution.h",
+    "engine/commit_contribution_impl.cc",
+    "engine/commit_contribution_impl.h",
+    "engine/commit_contributor.h",
+    "engine/commit_processor.cc",
+    "engine/commit_processor.h",
     "engine/commit_queue.h",
+    "engine/commit_util.cc",
+    "engine/commit_util.h",
     "engine/configure_reason.h",
+    "engine/cycle/data_type_tracker.cc",
+    "engine/cycle/data_type_tracker.h",
+    "engine/cycle/debug_info_getter.h",
+    "engine/cycle/entity_change_metric_recording.cc",
+    "engine/cycle/entity_change_metric_recording.h",
     "engine/cycle/model_neutral_state.cc",
     "engine/cycle/model_neutral_state.h",
+    "engine/cycle/nudge_tracker.cc",
+    "engine/cycle/nudge_tracker.h",
+    "engine/cycle/status_controller.cc",
+    "engine/cycle/status_controller.h",
+    "engine/cycle/sync_cycle.cc",
+    "engine/cycle/sync_cycle.h",
+    "engine/cycle/sync_cycle_context.cc",
+    "engine/cycle/sync_cycle_context.h",
     "engine/cycle/sync_cycle_snapshot.cc",
     "engine/cycle/sync_cycle_snapshot.h",
     "engine/data_type_activation_response.cc",
     "engine/data_type_activation_response.h",
     "engine/data_type_debug_info_listener.cc",
     "engine/data_type_debug_info_listener.h",
+    "engine/debug_info_event_listener.cc",
+    "engine/debug_info_event_listener.h",
     "engine/engine_components_factory.h",
     "engine/engine_components_factory_impl.cc",
     "engine/engine_components_factory_impl.h",
@@ -50,35 +83,87 @@ static_library("rest_of_sync") {
     "engine/engine_util.h",
     "engine/entity_data.cc",
     "engine/entity_data.h",
+    "engine/events/commit_request_event.cc",
+    "engine/events/commit_request_event.h",
+    "engine/events/commit_response_event.cc",
+    "engine/events/commit_response_event.h",
+    "engine/events/configure_get_updates_request_event.cc",
+    "engine/events/configure_get_updates_request_event.h",
+    "engine/events/get_updates_response_event.cc",
+    "engine/events/get_updates_response_event.h",
+    "engine/events/normal_get_updates_request_event.cc",
+    "engine/events/normal_get_updates_request_event.h",
+    "engine/events/poll_get_updates_request_event.cc",
+    "engine/events/poll_get_updates_request_event.h",
     "engine/events/protocol_event.cc",
     "engine/events/protocol_event.h",
+    "engine/events/protocol_event_buffer.cc",
+    "engine/events/protocol_event_buffer.h",
     "engine/events/protocol_event_observer.h",
     "engine/forwarding_model_type_processor.cc",
     "engine/forwarding_model_type_processor.h",
+    "engine/get_updates_delegate.cc",
+    "engine/get_updates_delegate.h",
+    "engine/get_updates_processor.cc",
+    "engine/get_updates_processor.h",
+    "engine/js_sync_encryption_handler_observer.cc",
+    "engine/js_sync_encryption_handler_observer.h",
+    "engine/js_sync_manager_observer.cc",
+    "engine/js_sync_manager_observer.h",
+    "engine/loopback_server/loopback_connection_manager.cc",
+    "engine/loopback_server/loopback_connection_manager.h",
+    "engine/loopback_server/loopback_server.cc",
+    "engine/loopback_server/loopback_server.h",
+    "engine/loopback_server/loopback_server_entity.cc",
+    "engine/loopback_server/loopback_server_entity.h",
+    "engine/loopback_server/persistent_bookmark_entity.cc",
+    "engine/loopback_server/persistent_bookmark_entity.h",
+    "engine/loopback_server/persistent_permanent_entity.cc",
+    "engine/loopback_server/persistent_permanent_entity.h",
+    "engine/loopback_server/persistent_tombstone_entity.cc",
+    "engine/loopback_server/persistent_tombstone_entity.h",
+    "engine/loopback_server/persistent_unique_client_entity.cc",
+    "engine/loopback_server/persistent_unique_client_entity.h",
     "engine/model_type_configurer.cc",
     "engine/model_type_configurer.h",
     "engine/model_type_connector.h",
+    "engine/model_type_connector_proxy.cc",
+    "engine/model_type_connector_proxy.h",
     "engine/model_type_processor.h",
     "engine/model_type_processor_proxy.cc",
     "engine/model_type_processor_proxy.h",
+    "engine/model_type_registry.cc",
+    "engine/model_type_registry.h",
+    "engine/model_type_worker.cc",
+    "engine/model_type_worker.h",
     "engine/net/http_bridge.cc",
     "engine/net/http_bridge.h",
     "engine/net/http_post_provider_factory.h",
     "engine/net/http_post_provider_interface.h",
+    "engine/net/server_connection_manager.cc",
+    "engine/net/server_connection_manager.h",
+    "engine/net/sync_server_connection_manager.cc",
+    "engine/net/sync_server_connection_manager.h",
+    "engine/net/url_translator.cc",
+    "engine/net/url_translator.h",
     "engine/nigori/cryptographer.cc",
     "engine/nigori/cryptographer.h",
     "engine/nigori/keystore_keys_handler.h",
     "engine/nigori/nigori.cc",
     "engine/nigori/nigori.h",
+    "engine/nudge_handler.h",
     "engine/polling_constants.cc",
     "engine/polling_constants.h",
     "engine/shutdown_reason.cc",
     "engine/shutdown_reason.h",
     "engine/sync_auth_provider.h",
     "engine/sync_credentials.h",
+    "engine/sync_cycle_event.cc",
+    "engine/sync_cycle_event.h",
     "engine/sync_encryption_handler.h",
     "engine/sync_engine.cc",
     "engine/sync_engine.h",
+    "engine/sync_engine_event_listener.h",
     "engine/sync_engine_host.h",
     "engine/sync_engine_switches.cc",
     "engine/sync_engine_switches.h",
@@ -86,109 +171,30 @@ static_library("rest_of_sync") {
     "engine/sync_manager.h",
     "engine/sync_manager_factory.cc",
     "engine/sync_manager_factory.h",
+    "engine/sync_manager_impl.cc",
+    "engine/sync_manager_impl.h",
+    "engine/sync_scheduler.h",
+    "engine/sync_scheduler_impl.cc",
+    "engine/sync_scheduler_impl.h",
     "engine/sync_status.cc",
     "engine/sync_status.h",
     "engine/sync_status_observer.h",
     "engine/sync_string_conversions.cc",
     "engine/sync_string_conversions.h",
-    "engine_impl/all_status.cc",
-    "engine_impl/all_status.h",
-    "engine_impl/backoff_delay_provider.cc",
-    "engine_impl/backoff_delay_provider.h",
-    "engine_impl/bookmark_update_preprocessing.cc",
-    "engine_impl/bookmark_update_preprocessing.h",
-    "engine_impl/cancelation_signal.cc",
-    "engine_impl/cancelation_signal.h",
-    "engine_impl/commit.cc",
-    "engine_impl/commit.h",
-    "engine_impl/commit_contribution.h",
-    "engine_impl/commit_contribution_impl.cc",
-    "engine_impl/commit_contribution_impl.h",
-    "engine_impl/commit_contributor.h",
-    "engine_impl/commit_processor.cc",
-    "engine_impl/commit_processor.h",
-    "engine_impl/commit_util.cc",
-    "engine_impl/commit_util.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/entity_change_metric_recording.cc",
-    "engine_impl/cycle/entity_change_metric_recording.h",
-    "engine_impl/cycle/nudge_tracker.cc",
-    "engine_impl/cycle/nudge_tracker.h",
-    "engine_impl/cycle/status_controller.cc",
-    "engine_impl/cycle/status_controller.h",
-    "engine_impl/cycle/sync_cycle.cc",
-    "engine_impl/cycle/sync_cycle.h",
-    "engine_impl/cycle/sync_cycle_context.cc",
-    "engine_impl/cycle/sync_cycle_context.h",
-    "engine_impl/debug_info_event_listener.cc",
-    "engine_impl/debug_info_event_listener.h",
-    "engine_impl/events/commit_request_event.cc",
-    "engine_impl/events/commit_request_event.h",
-    "engine_impl/events/commit_response_event.cc",
-    "engine_impl/events/commit_response_event.h",
-    "engine_impl/events/configure_get_updates_request_event.cc",
-    "engine_impl/events/configure_get_updates_request_event.h",
-    "engine_impl/events/get_updates_response_event.cc",
-    "engine_impl/events/get_updates_response_event.h",
-    "engine_impl/events/normal_get_updates_request_event.cc",
-    "engine_impl/events/normal_get_updates_request_event.h",
-    "engine_impl/events/poll_get_updates_request_event.cc",
-    "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_updates_delegate.cc",
-    "engine_impl/get_updates_delegate.h",
-    "engine_impl/get_updates_processor.cc",
-    "engine_impl/get_updates_processor.h",
-    "engine_impl/js_sync_encryption_handler_observer.cc",
-    "engine_impl/js_sync_encryption_handler_observer.h",
-    "engine_impl/js_sync_manager_observer.cc",
-    "engine_impl/js_sync_manager_observer.h",
-    "engine_impl/loopback_server/loopback_connection_manager.cc",
-    "engine_impl/loopback_server/loopback_connection_manager.h",
-    "engine_impl/loopback_server/loopback_server.cc",
-    "engine_impl/loopback_server/loopback_server.h",
-    "engine_impl/loopback_server/loopback_server_entity.cc",
-    "engine_impl/loopback_server/loopback_server_entity.h",
-    "engine_impl/loopback_server/persistent_bookmark_entity.cc",
-    "engine_impl/loopback_server/persistent_bookmark_entity.h",
-    "engine_impl/loopback_server/persistent_permanent_entity.cc",
-    "engine_impl/loopback_server/persistent_permanent_entity.h",
-    "engine_impl/loopback_server/persistent_tombstone_entity.cc",
-    "engine_impl/loopback_server/persistent_tombstone_entity.h",
-    "engine_impl/loopback_server/persistent_unique_client_entity.cc",
-    "engine_impl/loopback_server/persistent_unique_client_entity.h",
-    "engine_impl/model_type_connector_proxy.cc",
-    "engine_impl/model_type_connector_proxy.h",
-    "engine_impl/model_type_registry.cc",
-    "engine_impl/model_type_registry.h",
-    "engine_impl/model_type_worker.cc",
-    "engine_impl/model_type_worker.h",
-    "engine_impl/net/server_connection_manager.cc",
-    "engine_impl/net/server_connection_manager.h",
-    "engine_impl/net/sync_server_connection_manager.cc",
-    "engine_impl/net/sync_server_connection_manager.h",
-    "engine_impl/net/url_translator.cc",
-    "engine_impl/net/url_translator.h",
-    "engine_impl/nudge_handler.h",
-    "engine_impl/sync_cycle_event.cc",
-    "engine_impl/sync_cycle_event.h",
-    "engine_impl/sync_engine_event_listener.h",
-    "engine_impl/sync_manager_impl.cc",
-    "engine_impl/sync_manager_impl.h",
-    "engine_impl/sync_scheduler.h",
-    "engine_impl/sync_scheduler_impl.cc",
-    "engine_impl/sync_scheduler_impl.h",
-    "engine_impl/syncer.cc",
-    "engine_impl/syncer.h",
-    "engine_impl/syncer_proto_util.cc",
-    "engine_impl/syncer_proto_util.h",
-    "engine_impl/traffic_logger.cc",
-    "engine_impl/traffic_logger.h",
-    "engine_impl/update_handler.h",
+    "engine/syncer.cc",
+    "engine/syncer.h",
+    "engine/syncer_proto_util.cc",
+    "engine/syncer_proto_util.h",
+    "engine/traffic_logger.cc",
+    "engine/traffic_logger.h",
+    "engine/update_handler.h",
     "model/blocking_model_type_store.h",
+    "model/blocking_model_type_store_impl.cc",
+    "model/blocking_model_type_store_impl.h",
+    "model/client_tag_based_model_type_processor.cc",
+    "model/client_tag_based_model_type_processor.h",
+    "model/client_tag_based_remote_update_handler.cc",
+    "model/client_tag_based_remote_update_handler.h",
     "model/conflict_resolution.h",
     "model/data_batch.h",
     "model/data_type_activation_request.cc",
@@ -196,8 +202,14 @@ static_library("rest_of_sync") {
     "model/data_type_error_handler.h",
     "model/data_type_error_handler_impl.cc",
     "model/data_type_error_handler_impl.h",
+    "model/dummy_metadata_change_list.cc",
+    "model/dummy_metadata_change_list.h",
     "model/entity_change.cc",
     "model/entity_change.h",
+    "model/forwarding_model_type_controller_delegate.cc",
+    "model/forwarding_model_type_controller_delegate.h",
+    "model/in_memory_metadata_change_list.cc",
+    "model/in_memory_metadata_change_list.h",
     "model/metadata_batch.cc",
     "model/metadata_batch.h",
     "model/metadata_change_list.h",
@@ -205,13 +217,25 @@ static_library("rest_of_sync") {
     "model/model_error.h",
     "model/model_type_change_processor.h",
     "model/model_type_store.h",
+    "model/model_type_store_backend.cc",
+    "model/model_type_store_backend.h",
     "model/model_type_store_base.cc",
     "model/model_type_store_base.h",
+    "model/model_type_store_impl.cc",
+    "model/model_type_store_impl.h",
     "model/model_type_store_service.h",
+    "model/model_type_store_service_impl.cc",
+    "model/model_type_store_service_impl.h",
     "model/model_type_sync_bridge.cc",
     "model/model_type_sync_bridge.h",
     "model/mutable_data_batch.cc",
     "model/mutable_data_batch.h",
+    "model/processor_entity.cc",
+    "model/processor_entity.h",
+    "model/processor_entity_tracker.cc",
+    "model/processor_entity_tracker.h",
+    "model/proxy_model_type_controller_delegate.cc",
+    "model/proxy_model_type_controller_delegate.h",
     "model/string_ordinal.h",
     "model/sync_change.cc",
     "model/sync_change.h",
@@ -222,37 +246,13 @@ static_library("rest_of_sync") {
     "model/sync_error.h",
     "model/sync_error_factory.h",
     "model/sync_metadata_store.h",
+    "model/sync_metadata_store_change_list.cc",
+    "model/sync_metadata_store_change_list.h",
     "model/syncable_service.h",
+    "model/syncable_service_based_bridge.cc",
+    "model/syncable_service_based_bridge.h",
     "model/time.h",
     "model/type_entities_count.h",
-    "model_impl/blocking_model_type_store_impl.cc",
-    "model_impl/blocking_model_type_store_impl.h",
-    "model_impl/client_tag_based_model_type_processor.cc",
-    "model_impl/client_tag_based_model_type_processor.h",
-    "model_impl/client_tag_based_remote_update_handler.cc",
-    "model_impl/client_tag_based_remote_update_handler.h",
-    "model_impl/dummy_metadata_change_list.cc",
-    "model_impl/dummy_metadata_change_list.h",
-    "model_impl/forwarding_model_type_controller_delegate.cc",
-    "model_impl/forwarding_model_type_controller_delegate.h",
-    "model_impl/in_memory_metadata_change_list.cc",
-    "model_impl/in_memory_metadata_change_list.h",
-    "model_impl/model_type_store_backend.cc",
-    "model_impl/model_type_store_backend.h",
-    "model_impl/model_type_store_impl.cc",
-    "model_impl/model_type_store_impl.h",
-    "model_impl/model_type_store_service_impl.cc",
-    "model_impl/model_type_store_service_impl.h",
-    "model_impl/processor_entity.cc",
-    "model_impl/processor_entity.h",
-    "model_impl/processor_entity_tracker.cc",
-    "model_impl/processor_entity_tracker.h",
-    "model_impl/proxy_model_type_controller_delegate.cc",
-    "model_impl/proxy_model_type_controller_delegate.h",
-    "model_impl/sync_metadata_store_change_list.cc",
-    "model_impl/sync_metadata_store_change_list.h",
-    "model_impl/syncable_service_based_bridge.cc",
-    "model_impl/syncable_service_based_bridge.h",
     "nigori/cryptographer_impl.cc",
     "nigori/cryptographer_impl.h",
     "nigori/keystore_keys_cryptographer.cc",
@@ -305,8 +305,8 @@ static_library("rest_of_sync") {
 static_library("test_support_engine") {
   testonly = true
   sources = [
-    "engine_impl/cycle/mock_debug_info_getter.cc",
-    "engine_impl/cycle/mock_debug_info_getter.h",
+    "engine/cycle/mock_debug_info_getter.cc",
+    "engine/cycle/mock_debug_info_getter.h",
     "test/engine/fake_cryptographer.cc",
     "test/engine/fake_cryptographer.h",
     "test/engine/fake_model_type_connector.cc",
@@ -424,50 +424,50 @@ source_set("unit_tests") {
     "driver/sync_session_durations_metrics_recorder_unittest.cc",
     "driver/sync_stopped_reporter_unittest.cc",
     "driver/sync_user_settings_unittest.cc",
+    "engine/backoff_delay_provider_unittest.cc",
+    "engine/bookmark_update_preprocessing_unittest.cc",
+    "engine/cancelation_signal_unittest.cc",
+    "engine/commit_contribution_impl_unittest.cc",
+    "engine/commit_processor_unittest.cc",
+    "engine/cycle/nudge_tracker_unittest.cc",
+    "engine/cycle/status_controller_unittest.cc",
     "engine/cycle/sync_cycle_snapshot_unittest.cc",
+    "engine/debug_info_event_listener_unittest.cc",
     "engine/entity_data_unittest.cc",
+    "engine/events/protocol_event_buffer_unittest.cc",
+    "engine/get_updates_processor_unittest.cc",
+    "engine/js_sync_encryption_handler_observer_unittest.cc",
+    "engine/js_sync_manager_observer_unittest.cc",
+    "engine/loopback_server/loopback_server_unittest.cc",
+    "engine/loopback_server/persistent_bookmark_entity_unittest.cc",
+    "engine/loopback_server/persistent_permanent_entity_unittest.cc",
+    "engine/loopback_server/persistent_tombstone_entity_unittest.cc",
+    "engine/loopback_server/persistent_unique_client_entity_unittest.cc",
+    "engine/model_type_registry_unittest.cc",
+    "engine/model_type_worker_unittest.cc",
     "engine/net/http_bridge_unittest.cc",
-    "engine_impl/backoff_delay_provider_unittest.cc",
-    "engine_impl/bookmark_update_preprocessing_unittest.cc",
-    "engine_impl/cancelation_signal_unittest.cc",
-    "engine_impl/commit_contribution_impl_unittest.cc",
-    "engine_impl/commit_processor_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/events/protocol_event_buffer_unittest.cc",
-    "engine_impl/get_updates_processor_unittest.cc",
-    "engine_impl/js_sync_encryption_handler_observer_unittest.cc",
-    "engine_impl/js_sync_manager_observer_unittest.cc",
-    "engine_impl/loopback_server/loopback_server_unittest.cc",
-    "engine_impl/loopback_server/persistent_bookmark_entity_unittest.cc",
-    "engine_impl/loopback_server/persistent_permanent_entity_unittest.cc",
-    "engine_impl/loopback_server/persistent_tombstone_entity_unittest.cc",
-    "engine_impl/loopback_server/persistent_unique_client_entity_unittest.cc",
-    "engine_impl/model_type_registry_unittest.cc",
-    "engine_impl/model_type_worker_unittest.cc",
-    "engine_impl/net/sync_server_connection_manager_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/net/sync_server_connection_manager_unittest.cc",
+    "engine/sync_manager_impl_unittest.cc",
+    "engine/sync_scheduler_impl_unittest.cc",
+    "engine/syncer_proto_util_unittest.cc",
+    "engine/syncer_unittest.cc",
     "invalidations/fcm_handler_unittest.cc",
     "invalidations/interested_data_types_manager_unittest.cc",
     "js/js_event_details_unittest.cc",
     "js/sync_js_controller_unittest.cc",
+    "model/client_tag_based_model_type_processor_unittest.cc",
+    "model/client_tag_based_remote_update_handler_unittest.cc",
+    "model/in_memory_metadata_change_list_unittest.cc",
+    "model/model_type_store_backend_unittest.cc",
+    "model/model_type_store_impl_unittest.cc",
     "model/model_type_sync_bridge_unittest.cc",
     "model/mutable_data_batch_unittest.cc",
+    "model/processor_entity_tracker_unittest.cc",
+    "model/processor_entity_unittest.cc",
     "model/sync_change_unittest.cc",
     "model/sync_data_unittest.cc",
     "model/sync_error_unittest.cc",
-    "model_impl/client_tag_based_model_type_processor_unittest.cc",
-    "model_impl/client_tag_based_remote_update_handler_unittest.cc",
-    "model_impl/in_memory_metadata_change_list_unittest.cc",
-    "model_impl/model_type_store_backend_unittest.cc",
-    "model_impl/model_type_store_impl_unittest.cc",
-    "model_impl/processor_entity_tracker_unittest.cc",
-    "model_impl/processor_entity_unittest.cc",
-    "model_impl/syncable_service_based_bridge_unittest.cc",
+    "model/syncable_service_based_bridge_unittest.cc",
     "nigori/cryptographer_impl_unittest.cc",
     "nigori/keystore_keys_cryptographer_unittest.cc",
     "nigori/nigori_key_bag_unittest.cc",

components/sync/base/DEPS

@@ -6,6 +6,7 @@ include_rules = [
   "+components/prefs",
   "+components/sync/protocol",
   "+third_party/zlib",  # For UniquePosition compression
-  "+net",
+  "+net/base/net_errors.h",
+  "+net/http/http_status_code.h",
   "+ui/base",
 ]

components/sync/base/syncer_error.h

@@ -75,6 +75,7 @@ class SyncerError {
         http_status_code_(http_status_code) {}
 
   Value value_ = UNSET;
+  // TODO(crbug.com/947443): Consider storing the actual enums.
   int net_error_code_ = 0;
   int http_status_code_ = 0;
 };

components/sync/driver/DEPS

@@ -10,11 +10,10 @@ include_rules = [
   "+components/signin/public",
   "+components/sync/base",
   "+components/sync/engine",
-  "+components/sync/engine_impl",
+  "+components/sync/engine",
   "+components/sync/invalidations",
   "+components/sync/js",
   "+components/sync/model",
-  "+components/sync/model_impl",
   "+components/sync/nigori",
   "+components/sync/protocol",
   "+components/sync/test",

components/sync/driver/glue/sync_engine_backend.cc

@@ -28,7 +28,7 @@
 #include "components/sync/engine/sync_manager.h"
 #include "components/sync/engine/sync_manager_factory.h"
 #include "components/sync/invalidations/switches.h"
-#include "components/sync/model_impl/forwarding_model_type_controller_delegate.h"
+#include "components/sync/model/forwarding_model_type_controller_delegate.h"
 #include "components/sync/nigori/nigori_model_type_processor.h"
 #include "components/sync/nigori/nigori_storage_impl.h"
 #include "components/sync/nigori/nigori_sync_bridge_impl.h"

components/sync/driver/glue/sync_engine_backend.h

@@ -20,12 +20,12 @@
 #include "components/invalidation/public/invalidation.h"
 #include "components/sync/base/system_encryptor.h"
 #include "components/sync/driver/glue/sync_engine_impl.h"
+#include "components/sync/engine/cancelation_signal.h"
 #include "components/sync/engine/model_type_configurer.h"
 #include "components/sync/engine/shutdown_reason.h"
 #include "components/sync/engine/sync_encryption_handler.h"
 #include "components/sync/engine/sync_manager.h"
 #include "components/sync/engine/sync_status_observer.h"
-#include "components/sync/engine_impl/cancelation_signal.h"
 #include "url/gurl.h"
 
 namespace syncer {

components/sync/driver/model_type_controller_unittest.cc

@@ -22,8 +22,8 @@
 #include "components/sync/engine/model_type_configurer.h"
 #include "components/sync/engine/model_type_processor_proxy.h"
 #include "components/sync/model/data_type_activation_request.h"
+#include "components/sync/model/forwarding_model_type_controller_delegate.h"
 #include "components/sync/model/type_entities_count.h"
-#include "components/sync/model_impl/forwarding_model_type_controller_delegate.h"
 #include "components/sync/test/engine/fake_model_type_processor.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

components/sync/driver/non_ui_syncable_service_based_model_type_controller.cc

@@ -9,10 +9,10 @@
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "components/sync/base/model_type.h"
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
-#include "components/sync/model_impl/forwarding_model_type_controller_delegate.h"
-#include "components/sync/model_impl/proxy_model_type_controller_delegate.h"
-#include "components/sync/model_impl/syncable_service_based_bridge.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
+#include "components/sync/model/forwarding_model_type_controller_delegate.h"
+#include "components/sync/model/proxy_model_type_controller_delegate.h"
+#include "components/sync/model/syncable_service_based_bridge.h"
 
 namespace syncer {
 

components/sync/driver/syncable_service_based_model_type_controller.cc

@@ -7,9 +7,9 @@
 #include <memory>
 #include <utility>
 
-#include "components/sync/model_impl/client_tag_based_model_type_processor.h"
-#include "components/sync/model_impl/forwarding_model_type_controller_delegate.h"
-#include "components/sync/model_impl/syncable_service_based_bridge.h"
+#include "components/sync/model/client_tag_based_model_type_processor.h"
+#include "components/sync/model/forwarding_model_type_controller_delegate.h"
+#include "components/sync/model/syncable_service_based_bridge.h"
 
 namespace syncer {
 

components/sync/engine/DEPS

@@ -1,6 +1,11 @@
 include_rules = [
   "+components/sync/base",
-  "+components/sync/engine_impl",
   "+components/sync/protocol",
   "+components/sync/test",
+  "+components/sync/js",
+  "+net/base/net_errors.h",
+  "+net/http/http_status_code.h",
+  "+services/network/public",
+  "+services/network/test",
+  "+third_party/protobuf",
 ]

components/sync/engine/all_status.cc

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/all_status.h"
+#include "components/sync/engine/all_status.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/logging.h"
+#include "components/sync/engine/net/server_connection_manager.h"
+#include "components/sync/engine/sync_cycle_event.h"
 #include "components/sync/engine/sync_status_observer.h"
-#include "components/sync/engine_impl/net/server_connection_manager.h"
-#include "components/sync/engine_impl/sync_cycle_event.h"
 
 namespace syncer {
 

components/sync/engine/all_status.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_SYNC_ENGINE_IMPL_ALL_STATUS_H_
-#define COMPONENTS_SYNC_ENGINE_IMPL_ALL_STATUS_H_
+#ifndef COMPONENTS_SYNC_ENGINE_ALL_STATUS_H_
+#define COMPONENTS_SYNC_ENGINE_ALL_STATUS_H_
 
 #include <map>
 #include <string>
@@ -13,8 +13,8 @@
 #include "base/macros.h"
 #include "base/sequence_checker.h"
 #include "components/sync/base/model_type.h"
+#include "components/sync/engine/sync_engine_event_listener.h"
 #include "components/sync/engine/sync_status.h"
-#include "components/sync/engine_impl/sync_engine_event_listener.h"
 
 namespace syncer {
 
@@ -89,4 +89,4 @@ class AllStatus : public SyncEngineEventListener {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_ENGINE_IMPL_ALL_STATUS_H_
+#endif  // COMPONENTS_SYNC_ENGINE_ALL_STATUS_H_

components/sync/engine/backoff_delay_provider.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/backoff_delay_provider.h"
+#include "components/sync/engine/backoff_delay_provider.h"
 
 #include <stdint.h>
 

components/sync/engine/backoff_delay_provider.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_SYNC_ENGINE_IMPL_BACKOFF_DELAY_PROVIDER_H_
-#define COMPONENTS_SYNC_ENGINE_IMPL_BACKOFF_DELAY_PROVIDER_H_
+#ifndef COMPONENTS_SYNC_ENGINE_BACKOFF_DELAY_PROVIDER_H_
+#define COMPONENTS_SYNC_ENGINE_BACKOFF_DELAY_PROVIDER_H_
 
 #include <memory>
 
@@ -58,4 +58,4 @@ class BackoffDelayProvider {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_ENGINE_IMPL_BACKOFF_DELAY_PROVIDER_H_
+#endif  // COMPONENTS_SYNC_ENGINE_BACKOFF_DELAY_PROVIDER_H_

components/sync/engine/backoff_delay_provider_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/backoff_delay_provider.h"
+#include "components/sync/engine/backoff_delay_provider.h"
 
 #include <memory>
 

components/sync/engine/bookmark_update_preprocessing.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/bookmark_update_preprocessing.h"
+#include "components/sync/engine/bookmark_update_preprocessing.h"
 
 #include <array>
 

components/sync/engine/bookmark_update_preprocessing.h

@@ -7,8 +7,8 @@
 // data and migrate updates such that they resemble updates from a modern
 // client.
 
-#ifndef COMPONENTS_SYNC_ENGINE_IMPL_BOOKMARK_UPDATE_PREPROCESSING_H_
-#define COMPONENTS_SYNC_ENGINE_IMPL_BOOKMARK_UPDATE_PREPROCESSING_H_
+#ifndef COMPONENTS_SYNC_ENGINE_BOOKMARK_UPDATE_PREPROCESSING_H_
+#define COMPONENTS_SYNC_ENGINE_BOOKMARK_UPDATE_PREPROCESSING_H_
 
 #include <string>
 
@@ -46,4 +46,4 @@ std::string InferGuidForLegacyBookmarkForTesting(
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_ENGINE_IMPL_BOOKMARK_UPDATE_PREPROCESSING_H_
+#endif  // COMPONENTS_SYNC_ENGINE_BOOKMARK_UPDATE_PREPROCESSING_H_

components/sync/engine/bookmark_update_preprocessing_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/bookmark_update_preprocessing.h"
+#include "components/sync/engine/bookmark_update_preprocessing.h"
 
 #include <stdint.h>
 

components/sync/engine/cancelation_signal.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/cancelation_signal.h"
+#include "components/sync/engine/cancelation_signal.h"
 
 #include "base/check_op.h"
 

components/sync/engine/cancelation_signal.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_SYNC_ENGINE_IMPL_CANCELATION_SIGNAL_H_
-#define COMPONENTS_SYNC_ENGINE_IMPL_CANCELATION_SIGNAL_H_
+#ifndef COMPONENTS_SYNC_ENGINE_CANCELATION_SIGNAL_H_
+#define COMPONENTS_SYNC_ENGINE_CANCELATION_SIGNAL_H_
 
 #include "base/synchronization/lock.h"
 
@@ -77,4 +77,4 @@ class CancelationSignal {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_ENGINE_IMPL_CANCELATION_SIGNAL_H_
+#endif  // COMPONENTS_SYNC_ENGINE_CANCELATION_SIGNAL_H_

components/sync/engine/cancelation_signal_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/cancelation_signal.h"
+#include "components/sync/engine/cancelation_signal.h"
 
 #include "base/bind.h"
 #include "base/single_thread_task_runner.h"

components/sync/engine/commit.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/commit.h"
+#include "components/sync/engine/commit.h"
 
 #include <utility>
 
@@ -12,13 +12,13 @@
 #include "base/rand_util.h"
 #include "base/trace_event/trace_event.h"
 #include "components/sync/base/data_type_histogram.h"
-#include "components/sync/engine_impl/commit_processor.h"
-#include "components/sync/engine_impl/commit_util.h"
-#include "components/sync/engine_impl/cycle/sync_cycle.h"
-#include "components/sync/engine_impl/events/commit_request_event.h"
-#include "components/sync/engine_impl/events/commit_response_event.h"
-#include "components/sync/engine_impl/syncer.h"
-#include "components/sync/engine_impl/syncer_proto_util.h"
+#include "components/sync/engine/commit_processor.h"
+#include "components/sync/engine/commit_util.h"
+#include "components/sync/engine/cycle/sync_cycle.h"
+#include "components/sync/engine/events/commit_request_event.h"
+#include "components/sync/engine/events/commit_response_event.h"
+#include "components/sync/engine/syncer.h"
+#include "components/sync/engine/syncer_proto_util.h"
 
 namespace syncer {
 

components/sync/engine/commit.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_SYNC_ENGINE_IMPL_COMMIT_H_
-#define COMPONENTS_SYNC_ENGINE_IMPL_COMMIT_H_
+#ifndef COMPONENTS_SYNC_ENGINE_COMMIT_H_
+#define COMPONENTS_SYNC_ENGINE_COMMIT_H_
 
 #include <stddef.h>
 
@@ -16,8 +16,8 @@
 #include "components/sync/base/extensions_activity.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/base/syncer_error.h"
-#include "components/sync/engine_impl/commit_contribution.h"
-#include "components/sync/engine_impl/cycle/nudge_tracker.h"
+#include "components/sync/engine/commit_contribution.h"
+#include "components/sync/engine/cycle/nudge_tracker.h"
 #include "components/sync/protocol/sync.pb.h"
 
 namespace syncer {
@@ -79,4 +79,4 @@ class Commit {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_ENGINE_IMPL_COMMIT_H_
+#endif  // COMPONENTS_SYNC_ENGINE_COMMIT_H_

components/sync/engine/commit_contribution.h

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_SYNC_ENGINE_IMPL_COMMIT_CONTRIBUTION_H_
-#define COMPONENTS_SYNC_ENGINE_IMPL_COMMIT_CONTRIBUTION_H_
+#ifndef COMPONENTS_SYNC_ENGINE_COMMIT_CONTRIBUTION_H_
+#define COMPONENTS_SYNC_ENGINE_COMMIT_CONTRIBUTION_H_
 
 #include <stddef.h>
 
 #include "components/sync/base/syncer_error.h"
 #include "components/sync/engine/commit_and_get_updates_types.h"
-#include "components/sync/engine_impl/cycle/status_controller.h"
+#include "components/sync/engine/cycle/status_controller.h"
 #include "components/sync/protocol/sync.pb.h"
 
 namespace syncer {
@@ -53,4 +53,4 @@ class CommitContribution {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_ENGINE_IMPL_COMMIT_CONTRIBUTION_H_
+#endif  // COMPONENTS_SYNC_ENGINE_COMMIT_CONTRIBUTION_H_

components/sync/engine/commit_contribution_impl.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/commit_contribution_impl.h"
+#include "components/sync/engine/commit_contribution_impl.h"
 
 #include <algorithm>
 #include <utility>
@@ -13,8 +13,8 @@
 #include "components/sync/base/time.h"
 #include "components/sync/base/unique_position.h"
 #include "components/sync/engine/commit_and_get_updates_types.h"
-#include "components/sync/engine_impl/cycle/entity_change_metric_recording.h"
-#include "components/sync/engine_impl/model_type_worker.h"
+#include "components/sync/engine/cycle/entity_change_metric_recording.h"
+#include "components/sync/engine/model_type_worker.h"
 #include "components/sync/protocol/proto_value_conversions.h"
 
 namespace syncer {

components/sync/engine/commit_contribution_impl.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_SYNC_ENGINE_IMPL_COMMIT_CONTRIBUTION_IMPL_H_
-#define COMPONENTS_SYNC_ENGINE_IMPL_COMMIT_CONTRIBUTION_IMPL_H_
+#ifndef COMPONENTS_SYNC_ENGINE_COMMIT_CONTRIBUTION_IMPL_H_
+#define COMPONENTS_SYNC_ENGINE_COMMIT_CONTRIBUTION_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -14,7 +14,7 @@
 #include "base/macros.h"
 #include "components/sync/base/passphrase_enums.h"
 #include "components/sync/engine/commit_and_get_updates_types.h"
-#include "components/sync/engine_impl/commit_contribution.h"
+#include "components/sync/engine/commit_contribution.h"
 #include "components/sync/protocol/sync.pb.h"
 
 namespace syncer {
@@ -101,4 +101,4 @@ class CommitContributionImpl : public CommitContribution {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_ENGINE_IMPL_COMMIT_CONTRIBUTION_IMPL_H_
+#endif  // COMPONENTS_SYNC_ENGINE_COMMIT_CONTRIBUTION_IMPL_H_

components/sync/engine/commit_contribution_impl_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/commit_contribution_impl.h"
+#include "components/sync/engine/commit_contribution_impl.h"
 
 #include <memory>
 #include <string>

components/sync/engine/commit_contributor.h

@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_SYNC_ENGINE_IMPL_COMMIT_CONTRIBUTOR_H_
-#define COMPONENTS_SYNC_ENGINE_IMPL_COMMIT_CONTRIBUTOR_H_
+#ifndef COMPONENTS_SYNC_ENGINE_COMMIT_CONTRIBUTOR_H_
+#define COMPONENTS_SYNC_ENGINE_COMMIT_CONTRIBUTOR_H_
 
 #include <cstddef>
 #include <memory>
 
-
 namespace syncer {
 
 class CommitContribution;
@@ -31,4 +30,4 @@ class CommitContributor {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_ENGINE_IMPL_COMMIT_CONTRIBUTOR_H_
+#endif  // COMPONENTS_SYNC_ENGINE_COMMIT_CONTRIBUTOR_H_

components/sync/engine/commit_processor.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/commit_processor.h"
+#include "components/sync/engine/commit_processor.h"
 
 #include <memory>
 #include <utility>
@@ -10,8 +10,8 @@
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/notreached.h"
-#include "components/sync/engine_impl/commit_contribution.h"
-#include "components/sync/engine_impl/commit_contributor.h"
+#include "components/sync/engine/commit_contribution.h"
+#include "components/sync/engine/commit_contributor.h"
 #include "components/sync/protocol/sync.pb.h"
 
 namespace syncer {

components/sync/engine/commit_processor.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_SYNC_ENGINE_IMPL_COMMIT_PROCESSOR_H_
-#define COMPONENTS_SYNC_ENGINE_IMPL_COMMIT_PROCESSOR_H_
+#ifndef COMPONENTS_SYNC_ENGINE_COMMIT_PROCESSOR_H_
+#define COMPONENTS_SYNC_ENGINE_COMMIT_PROCESSOR_H_
 
 #include <stddef.h>
 
@@ -12,8 +12,8 @@
 
 #include "base/macros.h"
 #include "components/sync/base/model_type.h"
-#include "components/sync/engine_impl/commit.h"
-#include "components/sync/engine_impl/model_type_registry.h"
+#include "components/sync/engine/commit.h"
+#include "components/sync/engine/model_type_registry.h"
 
 namespace syncer {
 
@@ -80,4 +80,4 @@ class CommitProcessor {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_ENGINE_IMPL_COMMIT_PROCESSOR_H_
+#endif  // COMPONENTS_SYNC_ENGINE_COMMIT_PROCESSOR_H_

components/sync/engine/commit_processor_unittest.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/commit_processor.h"
+#include "components/sync/engine/commit_processor.h"
 
 #include <memory>
 
-#include "components/sync/engine_impl/commit_contribution.h"
-#include "components/sync/engine_impl/commit_contributor.h"
+#include "components/sync/engine/commit_contribution.h"
+#include "components/sync/engine/commit_contributor.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

components/sync/engine/commit_util.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/commit_util.h"
+#include "components/sync/engine/commit_util.h"
 
 namespace syncer {
 

components/sync/engine/commit_util.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_SYNC_ENGINE_IMPL_COMMIT_UTIL_H_
-#define COMPONENTS_SYNC_ENGINE_IMPL_COMMIT_UTIL_H_
+#ifndef COMPONENTS_SYNC_ENGINE_COMMIT_UTIL_H_
+#define COMPONENTS_SYNC_ENGINE_COMMIT_UTIL_H_
 
 #include <stdint.h>
 #include <string>
@@ -39,4 +39,4 @@ void AddClientConfigParamsToMessage(
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_ENGINE_IMPL_COMMIT_UTIL_H_
+#endif  // COMPONENTS_SYNC_ENGINE_COMMIT_UTIL_H_

components/sync/engine/cycle/data_type_tracker.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/cycle/data_type_tracker.h"
+#include "components/sync/engine/cycle/data_type_tracker.h"
 
 #include <algorithm>
 #include <utility>

components/sync/engine/cycle/data_type_tracker.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_DATA_TYPE_TRACKER_H_
-#define COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_DATA_TYPE_TRACKER_H_
+#ifndef COMPONENTS_SYNC_ENGINE_CYCLE_DATA_TYPE_TRACKER_H_
+#define COMPONENTS_SYNC_ENGINE_CYCLE_DATA_TYPE_TRACKER_H_
 
 #include <stddef.h>
 
@@ -196,4 +196,4 @@ class DataTypeTracker {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_DATA_TYPE_TRACKER_H_
+#endif  // COMPONENTS_SYNC_ENGINE_CYCLE_DATA_TYPE_TRACKER_H_

components/sync/engine/cycle/debug_info_getter.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_DEBUG_INFO_GETTER_H_
-#define COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_DEBUG_INFO_GETTER_H_
+#ifndef COMPONENTS_SYNC_ENGINE_CYCLE_DEBUG_INFO_GETTER_H_
+#define COMPONENTS_SYNC_ENGINE_CYCLE_DEBUG_INFO_GETTER_H_
 
 #include "components/sync/protocol/sync.pb.h"
 
@@ -25,4 +25,4 @@ class DebugInfoGetter {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_DEBUG_INFO_GETTER_H_
+#endif  // COMPONENTS_SYNC_ENGINE_CYCLE_DEBUG_INFO_GETTER_H_

components/sync/engine/cycle/entity_change_metric_recording.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/cycle/entity_change_metric_recording.h"
+#include "components/sync/engine/cycle/entity_change_metric_recording.h"
 
 #include "base/metrics/histogram_functions.h"
 

components/sync/engine/cycle/entity_change_metric_recording.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_ENTITY_CHANGE_METRIC_RECORDING_H_
-#define COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_ENTITY_CHANGE_METRIC_RECORDING_H_
+#ifndef COMPONENTS_SYNC_ENGINE_CYCLE_ENTITY_CHANGE_METRIC_RECORDING_H_
+#define COMPONENTS_SYNC_ENGINE_CYCLE_ENTITY_CHANGE_METRIC_RECORDING_H_
 
 #include <string>
 
@@ -29,4 +29,4 @@ std::string GetEntityChangeHistogramNameForTest(ModelType type);
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_ENTITY_CHANGE_METRIC_RECORDING_H_
+#endif  // COMPONENTS_SYNC_ENGINE_CYCLE_ENTITY_CHANGE_METRIC_RECORDING_H_

components/sync/engine/cycle/mock_debug_info_getter.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/cycle/mock_debug_info_getter.h"
+#include "components/sync/engine/cycle/mock_debug_info_getter.h"
 
 namespace syncer {
 

components/sync/engine/cycle/mock_debug_info_getter.h

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_MOCK_DEBUG_INFO_GETTER_H_
-#define COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_MOCK_DEBUG_INFO_GETTER_H_
+#ifndef COMPONENTS_SYNC_ENGINE_CYCLE_MOCK_DEBUG_INFO_GETTER_H_
+#define COMPONENTS_SYNC_ENGINE_CYCLE_MOCK_DEBUG_INFO_GETTER_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "components/sync/engine_impl/cycle/debug_info_getter.h"
+#include "components/sync/engine/cycle/debug_info_getter.h"
 #include "components/sync/protocol/sync.pb.h"
 
 namespace syncer {
@@ -33,4 +33,4 @@ class MockDebugInfoGetter : public DebugInfoGetter {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_MOCK_DEBUG_INFO_GETTER_H_
+#endif  // COMPONENTS_SYNC_ENGINE_CYCLE_MOCK_DEBUG_INFO_GETTER_H_

components/sync/engine/cycle/nudge_tracker.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/cycle/nudge_tracker.h"
+#include "components/sync/engine/cycle/nudge_tracker.h"
 
 #include <algorithm>
 #include <utility>

components/sync/engine/cycle/nudge_tracker.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_NUDGE_TRACKER_H_
-#define COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_NUDGE_TRACKER_H_
+#ifndef COMPONENTS_SYNC_ENGINE_CYCLE_NUDGE_TRACKER_H_
+#define COMPONENTS_SYNC_ENGINE_CYCLE_NUDGE_TRACKER_H_
 
 #include <stddef.h>
 
@@ -16,7 +16,7 @@
 #include "base/time/time.h"
 #include "components/sync/base/invalidation_interface.h"
 #include "components/sync/base/model_type.h"
-#include "components/sync/engine_impl/cycle/data_type_tracker.h"
+#include "components/sync/engine/cycle/data_type_tracker.h"
 #include "components/sync/protocol/sync.pb.h"
 
 namespace syncer {
@@ -214,4 +214,4 @@ class NudgeTracker {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_NUDGE_TRACKER_H_
+#endif  // COMPONENTS_SYNC_ENGINE_CYCLE_NUDGE_TRACKER_H_

components/sync/engine/cycle/nudge_tracker_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/cycle/nudge_tracker.h"
+#include "components/sync/engine/cycle/nudge_tracker.h"
 
 #include <stdint.h>
 

components/sync/engine/cycle/status_controller.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/cycle/status_controller.h"
+#include "components/sync/engine/cycle/status_controller.h"
 
 #include "components/sync/base/model_type.h"
 #include "components/sync/protocol/sync_protocol_error.h"

components/sync/engine/cycle/status_controller.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_STATUS_CONTROLLER_H_
-#define COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_STATUS_CONTROLLER_H_
+#ifndef COMPONENTS_SYNC_ENGINE_CYCLE_STATUS_CONTROLLER_H_
+#define COMPONENTS_SYNC_ENGINE_CYCLE_STATUS_CONTROLLER_H_
 
 #include <map>
 #include <vector>
@@ -101,4 +101,4 @@ class StatusController {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_STATUS_CONTROLLER_H_
+#endif  // COMPONENTS_SYNC_ENGINE_CYCLE_STATUS_CONTROLLER_H_

components/sync/engine/cycle/status_controller_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/cycle/sync_cycle.h"
+#include "components/sync/engine/cycle/sync_cycle.h"
 #include "net/http/http_status_code.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

components/sync/engine/cycle/sync_cycle.cc

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/cycle/sync_cycle.h"
+#include "components/sync/engine/cycle/sync_cycle.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
-#include "components/sync/engine_impl/update_handler.h"
+#include "components/sync/engine/update_handler.h"
 
 namespace syncer {
 

components/sync/engine/cycle/sync_cycle.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_SYNC_CYCLE_H_
-#define COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_SYNC_CYCLE_H_
+#ifndef COMPONENTS_SYNC_ENGINE_CYCLE_SYNC_CYCLE_H_
+#define COMPONENTS_SYNC_ENGINE_CYCLE_SYNC_CYCLE_H_
 
 #include <map>
 #include <memory>
@@ -15,10 +15,10 @@
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "components/sync/base/model_type.h"
+#include "components/sync/engine/cycle/status_controller.h"
+#include "components/sync/engine/cycle/sync_cycle_context.h"
 #include "components/sync/engine/cycle/sync_cycle_snapshot.h"
-#include "components/sync/engine_impl/cycle/status_controller.h"
-#include "components/sync/engine_impl/cycle/sync_cycle_context.h"
-#include "components/sync/engine_impl/sync_cycle_event.h"
+#include "components/sync/engine/sync_cycle_event.h"
 #include "components/sync/protocol/sync_protocol_error.h"
 
 namespace syncer {
@@ -124,4 +124,4 @@ class SyncCycle {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_SYNC_CYCLE_H_
+#endif  // COMPONENTS_SYNC_ENGINE_CYCLE_SYNC_CYCLE_H_

components/sync/engine/cycle/sync_cycle_context.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/cycle/sync_cycle_context.h"
+#include "components/sync/engine/cycle/sync_cycle_context.h"
 
 #include "components/sync/base/extensions_activity.h"
 

components/sync/engine/cycle/sync_cycle_context.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_SYNC_CYCLE_CONTEXT_H_
-#define COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_SYNC_CYCLE_CONTEXT_H_
+#ifndef COMPONENTS_SYNC_ENGINE_CYCLE_SYNC_CYCLE_CONTEXT_H_
+#define COMPONENTS_SYNC_ENGINE_CYCLE_SYNC_CYCLE_CONTEXT_H_
 
 #include <stdint.h>
 
@@ -14,9 +14,9 @@
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
-#include "components/sync/engine_impl/cycle/debug_info_getter.h"
-#include "components/sync/engine_impl/model_type_registry.h"
-#include "components/sync/engine_impl/sync_engine_event_listener.h"
+#include "components/sync/engine/cycle/debug_info_getter.h"
+#include "components/sync/engine/model_type_registry.h"
+#include "components/sync/engine/sync_engine_event_listener.h"
 
 namespace syncer {
 
@@ -189,4 +189,4 @@ class SyncCycleContext {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_SYNC_CYCLE_CONTEXT_H_
+#endif  // COMPONENTS_SYNC_ENGINE_CYCLE_SYNC_CYCLE_CONTEXT_H_

components/sync/engine/debug_info_event_listener.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync/engine_impl/debug_info_event_listener.h"
+#include "components/sync/engine/debug_info_event_listener.h"
 
 #include <stddef.h>
 

components/sync/engine/debug_info_event_listener.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_SYNC_ENGINE_IMPL_DEBUG_INFO_EVENT_LISTENER_H_
-#define COMPONENTS_SYNC_ENGINE_IMPL_DEBUG_INFO_EVENT_LISTENER_H_
+#ifndef COMPONENTS_SYNC_ENGINE_DEBUG_INFO_EVENT_LISTENER_H_
+#define COMPONENTS_SYNC_ENGINE_DEBUG_INFO_EVENT_LISTENER_H_
 
 #include <string>
 #include <vector>
@@ -15,11 +15,11 @@
 #include "base/sequence_checker.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/base/weak_handle.h"
+#include "components/sync/engine/cycle/debug_info_getter.h"
 #include "components/sync/engine/cycle/sync_cycle_snapshot.h"
 #include "components/sync/engine/data_type_debug_info_listener.h"
 #include "components/sync/engine/sync_encryption_handler.h"
 #include "components/sync/engine/sync_manager.h"
-#include "components/sync/engine_impl/cycle/debug_info_getter.h"
 #include "components/sync/js/js_backend.h"
 #include "components/sync/protocol/sync.pb.h"
 
@@ -117,4 +117,4 @@ class DebugInfoEventListener : public SyncManager::Observer,
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_ENGINE_IMPL_DEBUG_INFO_EVENT_LISTENER_H_
+#endif  // COMPONENTS_SYNC_ENGINE_DEBUG_INFO_EVENT_LISTENER_H_