BASELINE: Update Chromium to 57.0.2987.144

Change-Id: I29db402ff696c71a04c4dbaec822c2e53efe0267
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

1 files changed, 49 insertions, 47 deletions

diff --git a/chromium/components/sync/BUILD.gn b/chromium/components/sync/BUILD.gn
index 5bd464d93c8..2a552cd7662 100644
--- a/chromium/components/sync/BUILD.gn
+++ b/chromium/components/sync/BUILD.gn
@@ -99,8 +99,8 @@ static_library("sync") {
     "device_info/local_device_info_provider_impl.h",
     "driver/about_sync_util.cc",
     "driver/about_sync_util.h",
-    "driver/backend_data_type_configurer.cc",
-    "driver/backend_data_type_configurer.h",
+    "driver/async_directory_type_controller.cc",
+    "driver/async_directory_type_controller.h",
     "driver/backend_migrator.cc",
     "driver/backend_migrator.h",
     "driver/data_type_controller.cc",
@@ -122,25 +122,15 @@ static_library("sync") {
     "driver/generic_change_processor.h",
     "driver/generic_change_processor_factory.cc",
     "driver/generic_change_processor_factory.h",
-    "driver/glue/browser_thread_model_worker.cc",
-    "driver/glue/browser_thread_model_worker.h",
-    "driver/glue/sync_backend_host.cc",
-    "driver/glue/sync_backend_host.h",
     "driver/glue/sync_backend_host_core.cc",
     "driver/glue/sync_backend_host_core.h",
     "driver/glue/sync_backend_host_impl.cc",
     "driver/glue/sync_backend_host_impl.h",
-    "driver/glue/sync_backend_registrar.cc",
-    "driver/glue/sync_backend_registrar.h",
-    "driver/glue/ui_model_worker.cc",
-    "driver/glue/ui_model_worker.h",
     "driver/model_association_manager.cc",
     "driver/model_association_manager.h",
     "driver/model_associator.h",
     "driver/model_type_controller.cc",
     "driver/model_type_controller.h",
-    "driver/non_ui_data_type_controller.cc",
-    "driver/non_ui_data_type_controller.h",
     "driver/proxy_data_type_controller.cc",
     "driver/proxy_data_type_controller.h",
     "driver/shared_change_processor.cc",
@@ -158,10 +148,10 @@ static_library("sync") {
     "driver/sync_driver_switches.h",
     "driver/sync_error_controller.cc",
     "driver/sync_error_controller.h",
-    "driver/sync_frontend.cc",
-    "driver/sync_frontend.h",
     "driver/sync_service.cc",
     "driver/sync_service.h",
+    "driver/sync_service_base.cc",
+    "driver/sync_service_base.h",
     "driver/sync_service_observer.cc",
     "driver/sync_service_observer.h",
     "driver/sync_service_utils.cc",
@@ -171,8 +161,6 @@ static_library("sync") {
     "driver/sync_type_preference_provider.h",
     "driver/sync_util.cc",
     "driver/sync_util.h",
-    "driver/ui_data_type_controller.cc",
-    "driver/ui_data_type_controller.h",
     "driver/user_selectable_sync_type.h",
     "engine/activation_context.cc",
     "engine/activation_context.h",
@@ -194,6 +182,8 @@ static_library("sync") {
     "engine/attachments/in_memory_attachment_store.h",
     "engine/attachments/on_disk_attachment_store.cc",
     "engine/attachments/on_disk_attachment_store.h",
+    "engine/browser_thread_model_worker.cc",
+    "engine/browser_thread_model_worker.h",
     "engine/commit_queue.cc",
     "engine/commit_queue.h",
     "engine/configure_reason.h",
@@ -224,6 +214,8 @@ static_library("sync") {
     "engine/events/protocol_event_observer.h",
     "engine/model_safe_worker.cc",
     "engine/model_safe_worker.h",
+    "engine/model_type_configurer.cc",
+    "engine/model_type_configurer.h",
     "engine/model_type_connector.cc",
     "engine/model_type_connector.h",
     "engine/model_type_processor.cc",
@@ -245,8 +237,14 @@ static_library("sync") {
     "engine/polling_constants.h",
     "engine/shutdown_reason.h",
     "engine/sync_auth_provider.h",
+    "engine/sync_backend_registrar.cc",
+    "engine/sync_backend_registrar.h",
     "engine/sync_encryption_handler.cc",
     "engine/sync_encryption_handler.h",
+    "engine/sync_engine.cc",
+    "engine/sync_engine.h",
+    "engine/sync_engine_host.cc",
+    "engine/sync_engine_host.h",
     "engine/sync_manager.cc",
     "engine/sync_manager.h",
     "engine/sync_manager_factory.cc",
@@ -255,6 +253,8 @@ static_library("sync") {
     "engine/sync_status.h",
     "engine/sync_string_conversions.cc",
     "engine/sync_string_conversions.h",
+    "engine/ui_model_worker.cc",
+    "engine/ui_model_worker.h",
     "engine_impl/all_status.cc",
     "engine_impl/all_status.h",
     "engine_impl/apply_control_data_updates.cc",
@@ -336,6 +336,20 @@ static_library("sync") {
     "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",
@@ -422,6 +436,8 @@ static_library("sync") {
     "model/metadata_batch.cc",
     "model/metadata_batch.h",
     "model/metadata_change_list.h",
+    "model/model_error.cc",
+    "model/model_error.h",
     "model/model_type_change_processor.cc",
     "model/model_type_change_processor.h",
     "model/model_type_debug_info.cc",
@@ -467,6 +483,8 @@ static_library("sync") {
     "model_impl/shared_model_type_processor.h",
     "protocol/proto_enum_conversions.cc",
     "protocol/proto_enum_conversions.h",
+    "protocol/proto_memory_estimations.cc",
+    "protocol/proto_memory_estimations.h",
     "protocol/proto_value_conversions.cc",
     "protocol/proto_value_conversions.h",
     "protocol/proto_visitors.h",
@@ -568,6 +586,7 @@ static_library("sync") {
     "//components/os_crypt",
     "//components/pref_registry",
     "//components/prefs",
+    "//components/reading_list/core:reading_list_enable_flags",
     "//components/signin/core/browser",
     "//components/sync/engine_impl/attachments/proto",
     "//components/version_info",
@@ -604,26 +623,7 @@ static_library("sync") {
     ]
   }
 
-  if (is_win) {
-    sources += [
-      "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",
-    ]
-  }
-
-  if (enable_configuration_policy) {
+  if (!is_ios) {
     sources += [
       "driver/sync_policy_handler.cc",
       "driver/sync_policy_handler.h",
@@ -682,6 +682,8 @@ static_library("test_support_engine") {
     "engine/fake_model_type_processor.h",
     "engine/fake_sync_manager.cc",
     "engine/fake_sync_manager.h",
+    "engine/sync_engine_host_stub.cc",
+    "engine/sync_engine_host_stub.h",
     "engine/sync_manager_factory_for_profile_sync_test.cc",
     "engine/sync_manager_factory_for_profile_sync_test.h",
     "engine/test_engine_components_factory.cc",
@@ -758,6 +760,8 @@ static_library("test_support_model") {
     "model/mock_model_type_store.h",
     "model/model_type_store_test_util.cc",
     "model/model_type_store_test_util.h",
+    "model/recording_model_type_change_processor.cc",
+    "model/recording_model_type_change_processor.h",
     "model/stub_model_type_sync_bridge.cc",
     "model/stub_model_type_sync_bridge.h",
     "model/sync_change_processor_wrapper_for_test.cc",
@@ -782,6 +786,8 @@ static_library("test_support_driver") {
   sources = [
     "device_info/local_device_info_provider_mock.cc",
     "device_info/local_device_info_provider_mock.h",
+    "driver/async_directory_type_controller_mock.cc",
+    "driver/async_directory_type_controller_mock.h",
     "driver/data_type_controller_mock.cc",
     "driver/data_type_controller_mock.h",
     "driver/data_type_manager_mock.cc",
@@ -796,14 +802,12 @@ static_library("test_support_driver") {
     "driver/fake_sync_service.h",
     "driver/frontend_data_type_controller_mock.cc",
     "driver/frontend_data_type_controller_mock.h",
-    "driver/glue/sync_backend_host_mock.cc",
-    "driver/glue/sync_backend_host_mock.h",
     "driver/model_associator_mock.cc",
     "driver/model_associator_mock.h",
-    "driver/non_ui_data_type_controller_mock.cc",
-    "driver/non_ui_data_type_controller_mock.h",
     "driver/sync_api_component_factory_mock.cc",
     "driver/sync_api_component_factory_mock.h",
+    "engine/fake_sync_engine.cc",
+    "engine/fake_sync_engine.h",
     "model/change_processor_mock.cc",
     "model/change_processor_mock.h",
   ]
@@ -850,31 +854,30 @@ source_set("unit_tests") {
     "device_info/device_info_util_unittest.cc",
     "device_info/local_device_info_provider_impl_unittest.cc",
     "driver/about_sync_util_unittest.cc",
+    "driver/async_directory_type_controller_unittest.cc",
     "driver/backend_migrator_unittest.cc",
     "driver/data_type_manager_impl_unittest.cc",
     "driver/frontend_data_type_controller_unittest.cc",
     "driver/generic_change_processor_unittest.cc",
-    "driver/glue/browser_thread_model_worker_unittest.cc",
     "driver/glue/sync_backend_host_impl_unittest.cc",
-    "driver/glue/sync_backend_registrar_unittest.cc",
-    "driver/glue/ui_model_worker_unittest.cc",
     "driver/model_association_manager_unittest.cc",
     "driver/model_type_controller_unittest.cc",
-    "driver/non_ui_data_type_controller_unittest.cc",
     "driver/shared_change_processor_unittest.cc",
     "driver/startup_controller_unittest.cc",
     "driver/sync_stopped_reporter_unittest.cc",
     "driver/sync_util_unittest.cc",
-    "driver/ui_data_type_controller_unittest.cc",
     "engine/attachments/attachment_store_frontend_unittest.cc",
     "engine/attachments/attachment_store_test_template.h",
     "engine/attachments/fake_attachment_downloader_unittest.cc",
     "engine/attachments/fake_attachment_uploader_unittest.cc",
     "engine/attachments/in_memory_attachment_store_unittest.cc",
     "engine/attachments/on_disk_attachment_store_unittest.cc",
+    "engine/browser_thread_model_worker_unittest.cc",
     "engine/cycle/sync_cycle_snapshot_unittest.cc",
     "engine/model_safe_worker_unittest.cc",
     "engine/net/http_bridge_unittest.cc",
+    "engine/sync_backend_registrar_unittest.cc",
+    "engine/ui_model_worker_unittest.cc",
     "engine_impl/apply_control_data_updates_unittest.cc",
     "engine_impl/attachments/attachment_downloader_impl_unittest.cc",
     "engine_impl/attachments/attachment_uploader_impl_unittest.cc",
@@ -957,7 +960,6 @@ source_set("unit_tests") {
     "//base/test:test_support",
     "//components/invalidation/impl",
     "//components/os_crypt:test_support",
-    "//components/pref_registry:test_support",
     "//components/prefs:test_support",
     "//components/signin/core/browser:test_support",
     "//components/sync/engine_impl/attachments/proto",
@@ -991,7 +993,7 @@ source_set("unit_tests") {
     sources += [ "engine_impl/loopback_server/loopback_server_unittest.cc" ]
   }
 
-  if (enable_configuration_policy) {
+  if (!is_ios) {
     sources += [ "driver/sync_policy_handler_unittest.cc" ]
     deps += [
       "//components/policy:generated",