Refactor: Move SyncMergeResult to components/sync/driver

TBR=sky@chromium.org
TBR=rouslan@chromium.org

Bug: 1057577
Change-Id: Iccb6ae9ad543a63b0764fdb0703e3137bc808f32
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2153070
Commit-Queue: Victor Vianna <victorvianna@google.com>
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#760060}

chrome/browser/spellchecker/spellcheck_custom_dictionary.h

@@ -17,9 +17,9 @@
 #include "base/observer_list.h"
 #include "base/sequenced_task_runner.h"
 #include "components/spellcheck/browser/spellcheck_dictionary.h"
+#include "components/sync/driver/sync_merge_result.h"
 #include "components/sync/model/model_error.h"
 #include "components/sync/model/sync_data.h"
-#include "components/sync/model/sync_merge_result.h"
 #include "components/sync/model/syncable_service.h"
 
 namespace base {

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

@@ -24,9 +24,9 @@
 #include "components/sync/base/data_type_histogram.h"
 #include "components/sync/base/hash_util.h"
 #include "components/sync/driver/sync_driver_switches.h"
+#include "components/sync/driver/sync_merge_result.h"
 #include "components/sync/model/entity_data.h"
 #include "components/sync/model/mutable_data_batch.h"
-#include "components/sync/model/sync_merge_result.h"
 #include "components/sync/model_impl/client_tag_based_model_type_processor.h"
 #include "components/sync/model_impl/sync_metadata_store_change_list.h"
 

components/history/core/browser/history_service_unittest.cc

@@ -43,13 +43,13 @@
 #include "components/history/core/browser/history_db_task.h"
 #include "components/history/core/test/database_test_utils.h"
 #include "components/history/core/test/test_history_database.h"
+#include "components/sync/driver/sync_merge_result.h"
 #include "components/sync/model/fake_sync_change_processor.h"
 #include "components/sync/model/sync_change.h"
 #include "components/sync/model/sync_change_processor.h"
 #include "components/sync/model/sync_change_processor_wrapper_for_test.h"
 #include "components/sync/model/sync_error.h"
 #include "components/sync/model/sync_error_factory.h"
-#include "components/sync/model/sync_merge_result.h"
 #include "components/sync/protocol/history_delete_directive_specifics.pb.h"
 #include "components/sync/protocol/sync.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"

components/sync/BUILD.gn

@@ -277,8 +277,6 @@ jumbo_static_library("rest_of_sync") {
     "model/sync_error.h",
     "model/sync_error_factory.cc",
     "model/sync_error_factory.h",
-    "model/sync_merge_result.cc",
-    "model/sync_merge_result.h",
     "model/sync_metadata_store.h",
     "model/syncable_service.h",
     "model/time.h",
@@ -582,6 +580,7 @@ source_set("unit_tests") {
     "driver/profile_sync_service_unittest.cc",
     "driver/startup_controller_unittest.cc",
     "driver/sync_auth_manager_unittest.cc",
+    "driver/sync_merge_result_unittest.cc",
     "driver/sync_service_crypto_unittest.cc",
     "driver/sync_service_utils_unittest.cc",
     "driver/sync_session_durations_metrics_recorder_unittest.cc",
@@ -630,7 +629,6 @@ source_set("unit_tests") {
     "model/sync_change_unittest.cc",
     "model/sync_data_unittest.cc",
     "model/sync_error_unittest.cc",
-    "model/sync_merge_result_unittest.cc",
     "model_impl/client_tag_based_model_type_processor_unittest.cc",
     "model_impl/in_memory_metadata_change_list_unittest.cc",
     "model_impl/model_type_store_backend_unittest.cc",

components/sync/driver/BUILD.gn

@@ -58,6 +58,8 @@ jumbo_static_library("driver") {
     "sync_client.h",
     "sync_driver_switches.cc",
     "sync_driver_switches.h",
+    "sync_merge_result.cc",
+    "sync_merge_result.h",
     "sync_service.cc",
     "sync_service.h",
     "sync_service_crypto.cc",

components/sync/driver/data_type_controller_mock.h

@@ -6,8 +6,8 @@
 #define COMPONENTS_SYNC_DRIVER_DATA_TYPE_CONTROLLER_MOCK_H__
 
 #include "components/sync/driver/data_type_controller.h"
+#include "components/sync/driver/sync_merge_result.h"
 #include "components/sync/model/sync_error.h"
-#include "components/sync/model/sync_merge_result.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace syncer {

components/sync/driver/fake_data_type_controller.cc

@@ -9,8 +9,8 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/threading/sequenced_task_runner_handle.h"
+#include "components/sync/driver/sync_merge_result.h"
 #include "components/sync/model/data_type_error_handler_impl.h"
-#include "components/sync/model/sync_merge_result.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

components/sync/driver/model_association_manager.cc

@@ -20,7 +20,7 @@
 #include "base/trace_event/trace_event.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/base/sync_stop_metadata_fate.h"
-#include "components/sync/model/sync_merge_result.h"
+#include "components/sync/driver/sync_merge_result.h"
 
 namespace syncer {
 

components/sync/driver/model_type_controller.cc

@@ -12,11 +12,11 @@
 #include "components/signin/public/identity_manager/account_info.h"
 #include "components/sync/base/data_type_histogram.h"
 #include "components/sync/driver/configure_context.h"
+#include "components/sync/driver/sync_merge_result.h"
 #include "components/sync/engine/data_type_activation_response.h"
 #include "components/sync/engine/model_type_configurer.h"
 #include "components/sync/model/data_type_activation_request.h"
 #include "components/sync/model/data_type_error_handler_impl.h"
-#include "components/sync/model/sync_merge_result.h"
 
 namespace syncer {
 namespace {

components/sync/driver/model_type_controller_unittest.cc

@@ -16,13 +16,13 @@
 #include "base/test/task_environment.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "components/sync/driver/configure_context.h"
+#include "components/sync/driver/sync_merge_result.h"
 #include "components/sync/engine/commit_queue.h"
 #include "components/sync/engine/data_type_activation_response.h"
 #include "components/sync/engine/fake_model_type_processor.h"
 #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/sync_merge_result.h"
 #include "components/sync/model_impl/forwarding_model_type_controller_delegate.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

components/sync/model/sync_merge_result.cc → components/sync/driver/sync_merge_result.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/model/sync_merge_result.h"
+#include "components/sync/driver/sync_merge_result.h"
 
 namespace syncer {
 

components/sync/model/sync_merge_result.h → components/sync/driver/sync_merge_result.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_MODEL_SYNC_MERGE_RESULT_H_
-#define COMPONENTS_SYNC_MODEL_SYNC_MERGE_RESULT_H_
+#ifndef COMPONENTS_SYNC_DRIVER_SYNC_MERGE_RESULT_H_
+#define COMPONENTS_SYNC_DRIVER_SYNC_MERGE_RESULT_H_
 
 #include <stdint.h>
 
@@ -77,4 +77,4 @@ class SyncMergeResult {
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_MODEL_SYNC_MERGE_RESULT_H_
+#endif  // COMPONENTS_SYNC_DRIVER_SYNC_MERGE_RESULT_H_

components/sync/model/sync_merge_result_unittest.cc → components/sync/driver/sync_merge_result_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/model/sync_merge_result.h"
+#include "components/sync/driver/sync_merge_result.h"
 
 #include "base/location.h"
 #include "testing/gtest/include/gtest/gtest.h"

components/sync_sessions/proxy_tabs_data_type_controller.cc

@@ -8,9 +8,9 @@
 
 #include "base/values.h"
 #include "components/sync/driver/configure_context.h"
+#include "components/sync/driver/sync_merge_result.h"
 #include "components/sync/engine/model_safe_worker.h"
 #include "components/sync/engine/model_type_configurer.h"
-#include "components/sync/model/sync_merge_result.h"
 
 namespace sync_sessions {