diff options
54 files changed, 155 insertions, 90 deletions
diff --git a/chrome/browser/sync/DEPS b/chrome/browser/sync/DEPS index 15a1111..b0e3c4f 100644 --- a/chrome/browser/sync/DEPS +++ b/chrome/browser/sync/DEPS @@ -1,4 +1,6 @@ include_rules = [ + "+components/sync_driver", + # Used by tests. "+google/cacheinvalidation", diff --git a/chrome/browser/sync/glue/bookmark_change_processor.h b/chrome/browser/sync/glue/bookmark_change_processor.h index 7945b5b..f0474b0 100644 --- a/chrome/browser/sync/glue/bookmark_change_processor.h +++ b/chrome/browser/sync/glue/bookmark_change_processor.h @@ -11,8 +11,8 @@ #include "chrome/browser/bookmarks/bookmark_model_observer.h" #include "chrome/browser/sync/glue/bookmark_model_associator.h" #include "chrome/browser/sync/glue/change_processor.h" -#include "chrome/browser/sync/glue/data_type_error_handler.h" #include "chrome/browser/sync/glue/sync_backend_host.h" +#include "components/sync_driver/data_type_error_handler.h" namespace base { class RefCountedMemory; diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc index 9a67113..75ae26f 100644 --- a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc @@ -19,11 +19,11 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/glue/change_processor_mock.h" #include "chrome/browser/sync/glue/data_type_controller_mock.h" -#include "chrome/browser/sync/glue/model_associator_mock.h" #include "chrome/browser/sync/profile_sync_components_factory_mock.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/test/base/profile_mock.h" #include "components/browser_context_keyed_service/refcounted_browser_context_keyed_service.h" +#include "components/sync_driver/model_associator_mock.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_browser_thread.h" #include "sync/api/sync_error.h" diff --git a/chrome/browser/sync/glue/bookmark_model_associator.h b/chrome/browser/sync/glue/bookmark_model_associator.h index cf348b7..50f3afc 100644 --- a/chrome/browser/sync/glue/bookmark_model_associator.h +++ b/chrome/browser/sync/glue/bookmark_model_associator.h @@ -13,8 +13,8 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/sync/glue/data_type_controller.h" -#include "chrome/browser/sync/glue/data_type_error_handler.h" -#include "chrome/browser/sync/glue/model_associator.h" +#include "components/sync_driver/data_type_error_handler.h" +#include "components/sync_driver/model_associator.h" #include "sync/internal_api/public/util/unrecoverable_error_handler.h" class BookmarkModel; diff --git a/chrome/browser/sync/glue/change_processor.h b/chrome/browser/sync/glue/change_processor.h index f2da744..3d6ef47 100644 --- a/chrome/browser/sync/glue/change_processor.h +++ b/chrome/browser/sync/glue/change_processor.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_SYNC_GLUE_CHANGE_PROCESSOR_H_ #define CHROME_BROWSER_SYNC_GLUE_CHANGE_PROCESSOR_H_ -#include "chrome/browser/sync/glue/data_type_error_handler.h" #include "chrome/browser/sync/glue/sync_backend_host.h" +#include "components/sync_driver/data_type_error_handler.h" #include "sync/internal_api/public/change_record.h" class Profile; diff --git a/chrome/browser/sync/glue/data_type_controller.h b/chrome/browser/sync/glue/data_type_controller.h index d0aa9ae..5349e03 100644 --- a/chrome/browser/sync/glue/data_type_controller.h +++ b/chrome/browser/sync/glue/data_type_controller.h @@ -11,7 +11,7 @@ #include "base/callback.h" #include "base/location.h" #include "base/sequenced_task_runner_helpers.h" -#include "chrome/browser/sync/glue/data_type_error_handler.h" +#include "components/sync_driver/data_type_error_handler.h" #include "content/public/browser/browser_thread.h" #include "sync/api/sync_merge_result.h" #include "sync/internal_api/public/base/model_type.h" diff --git a/chrome/browser/sync/glue/data_type_manager_impl.cc b/chrome/browser/sync/glue/data_type_manager_impl.cc index 468ecd6..7a184e4 100644 --- a/chrome/browser/sync/glue/data_type_manager_impl.cc +++ b/chrome/browser/sync/glue/data_type_manager_impl.cc @@ -18,9 +18,9 @@ #include "base/strings/stringprintf.h" #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h" #include "chrome/browser/sync/glue/data_type_controller.h" -#include "chrome/browser/sync/glue/data_type_encryption_handler.h" #include "chrome/browser/sync/glue/data_type_manager_observer.h" #include "chrome/browser/sync/glue/failed_data_types_handler.h" +#include "components/sync_driver/data_type_encryption_handler.h" #include "content/public/browser/browser_thread.h" #include "sync/internal_api/public/data_type_debug_info_listener.h" diff --git a/chrome/browser/sync/glue/data_type_manager_impl.h b/chrome/browser/sync/glue/data_type_manager_impl.h index f356072..a901793 100644 --- a/chrome/browser/sync/glue/data_type_manager_impl.h +++ b/chrome/browser/sync/glue/data_type_manager_impl.h @@ -15,8 +15,8 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" -#include "chrome/browser/sync/glue/backend_data_type_configurer.h" #include "chrome/browser/sync/glue/model_association_manager.h" +#include "components/sync_driver/backend_data_type_configurer.h" namespace syncer { struct DataTypeConfigurationStats; diff --git a/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc b/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc index 015159b..ec5e821 100644 --- a/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc +++ b/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc @@ -7,12 +7,12 @@ #include "base/compiler_specific.h" #include "base/message_loop/message_loop.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/sync/glue/backend_data_type_configurer.h" #include "chrome/browser/sync/glue/data_type_controller.h" -#include "chrome/browser/sync/glue/data_type_encryption_handler.h" #include "chrome/browser/sync/glue/data_type_manager_observer.h" #include "chrome/browser/sync/glue/failed_data_types_handler.h" #include "chrome/browser/sync/glue/fake_data_type_controller.h" +#include "components/sync_driver/backend_data_type_configurer.h" +#include "components/sync_driver/data_type_encryption_handler.h" #include "content/public/test/test_browser_thread.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/configure_reason.h" diff --git a/chrome/browser/sync/glue/frontend_data_type_controller.cc b/chrome/browser/sync/glue/frontend_data_type_controller.cc index 6cfa84f..dbc7dee 100644 --- a/chrome/browser/sync/glue/frontend_data_type_controller.cc +++ b/chrome/browser/sync/glue/frontend_data_type_controller.cc @@ -8,9 +8,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/glue/change_processor.h" #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h" -#include "chrome/browser/sync/glue/model_associator.h" #include "chrome/browser/sync/profile_sync_components_factory.h" #include "chrome/browser/sync/profile_sync_service.h" +#include "components/sync_driver/model_associator.h" #include "content/public/browser/browser_thread.h" #include "sync/api/sync_error.h" #include "sync/internal_api/public/base/model_type.h" diff --git a/chrome/browser/sync/glue/frontend_data_type_controller.h b/chrome/browser/sync/glue/frontend_data_type_controller.h index aec7348..fb824ad7 100644 --- a/chrome/browser/sync/glue/frontend_data_type_controller.h +++ b/chrome/browser/sync/glue/frontend_data_type_controller.h @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/sync/glue/data_type_controller.h" -#include "chrome/browser/sync/glue/data_type_error_handler.h" +#include "components/sync_driver/data_type_error_handler.h" class Profile; class ProfileSyncService; diff --git a/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc b/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc index edd1c6d..f7f06d2 100644 --- a/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc @@ -14,10 +14,10 @@ #include "chrome/browser/sync/glue/data_type_controller_mock.h" #include "chrome/browser/sync/glue/frontend_data_type_controller.h" #include "chrome/browser/sync/glue/frontend_data_type_controller_mock.h" -#include "chrome/browser/sync/glue/model_associator_mock.h" #include "chrome/browser/sync/profile_sync_components_factory_mock.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/test/base/profile_mock.h" +#include "components/sync_driver/model_associator_mock.h" #include "content/public/test/test_browser_thread.h" using browser_sync::ChangeProcessorMock; diff --git a/chrome/browser/sync/glue/generic_change_processor.h b/chrome/browser/sync/glue/generic_change_processor.h index b0882fa..274d5da 100644 --- a/chrome/browser/sync/glue/generic_change_processor.h +++ b/chrome/browser/sync/glue/generic_change_processor.h @@ -12,7 +12,7 @@ #include "base/threading/non_thread_safe.h" #include "chrome/browser/sync/glue/change_processor.h" #include "chrome/browser/sync/glue/data_type_controller.h" -#include "chrome/browser/sync/glue/data_type_error_handler.h" +#include "components/sync_driver/data_type_error_handler.h" #include "sync/api/sync_change_processor.h" #include "sync/api/sync_merge_result.h" diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller.cc b/chrome/browser/sync/glue/non_frontend_data_type_controller.cc index 88fee95..2bd9933 100644 --- a/chrome/browser/sync/glue/non_frontend_data_type_controller.cc +++ b/chrome/browser/sync/glue/non_frontend_data_type_controller.cc @@ -10,9 +10,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/glue/change_processor.h" #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h" -#include "chrome/browser/sync/glue/model_associator.h" #include "chrome/browser/sync/profile_sync_components_factory.h" #include "chrome/browser/sync/profile_sync_service.h" +#include "components/sync_driver/model_associator.h" #include "content/public/browser/browser_thread.h" #include "sync/api/sync_error.h" #include "sync/internal_api/public/base/model_type.h" diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller.h b/chrome/browser/sync/glue/non_frontend_data_type_controller.h index 35cacb0..1e73330 100644 --- a/chrome/browser/sync/glue/non_frontend_data_type_controller.h +++ b/chrome/browser/sync/glue/non_frontend_data_type_controller.h @@ -14,8 +14,8 @@ #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" #include "chrome/browser/sync/glue/data_type_controller.h" -#include "chrome/browser/sync/glue/data_type_error_handler.h" #include "chrome/browser/sync/profile_sync_components_factory.h" +#include "components/sync_driver/data_type_error_handler.h" class Profile; class ProfileSyncService; diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc b/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc index 97da38d..d7574ea 100644 --- a/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc @@ -15,12 +15,12 @@ #include "base/tracked_objects.h" #include "chrome/browser/sync/glue/change_processor_mock.h" #include "chrome/browser/sync/glue/data_type_controller_mock.h" -#include "chrome/browser/sync/glue/model_associator_mock.h" #include "chrome/browser/sync/glue/non_frontend_data_type_controller.h" #include "chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h" #include "chrome/browser/sync/profile_sync_components_factory_mock.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/test/base/profile_mock.h" +#include "components/sync_driver/model_associator_mock.h" #include "content/public/test/test_browser_thread.h" #include "sync/internal_api/public/engine/model_safe_worker.h" diff --git a/chrome/browser/sync/glue/password_change_processor.h b/chrome/browser/sync/glue/password_change_processor.h index 5a5d80e..ab76b4c 100644 --- a/chrome/browser/sync/glue/password_change_processor.h +++ b/chrome/browser/sync/glue/password_change_processor.h @@ -9,9 +9,9 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "chrome/browser/sync/glue/data_type_error_handler.h" #include "chrome/browser/sync/glue/password_model_associator.h" #include "chrome/browser/sync/glue/sync_backend_host.h" +#include "components/sync_driver/data_type_error_handler.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_types.h" diff --git a/chrome/browser/sync/glue/password_model_associator.h b/chrome/browser/sync/glue/password_model_associator.h index 2c9dfab..1fc0119 100644 --- a/chrome/browser/sync/glue/password_model_associator.h +++ b/chrome/browser/sync/glue/password_model_associator.h @@ -13,8 +13,8 @@ #include "base/compiler_specific.h" #include "base/synchronization/lock.h" #include "chrome/browser/history/history_types.h" -#include "chrome/browser/sync/glue/data_type_error_handler.h" -#include "chrome/browser/sync/glue/model_associator.h" +#include "components/sync_driver/data_type_error_handler.h" +#include "components/sync_driver/model_associator.h" #include "sync/protocol/password_specifics.pb.h" class PasswordStore; diff --git a/chrome/browser/sync/glue/session_change_processor.h b/chrome/browser/sync/glue/session_change_processor.h index d486234..1152f8b 100644 --- a/chrome/browser/sync/glue/session_change_processor.h +++ b/chrome/browser/sync/glue/session_change_processor.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "chrome/browser/sync/glue/change_processor.h" -#include "chrome/browser/sync/glue/data_type_error_handler.h" +#include "components/sync_driver/data_type_error_handler.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_types.h" diff --git a/chrome/browser/sync/glue/session_model_associator.h b/chrome/browser/sync/glue/session_model_associator.h index fceb6bd..b54a926 100644 --- a/chrome/browser/sync/glue/session_model_associator.h +++ b/chrome/browser/sync/glue/session_model_associator.h @@ -21,10 +21,10 @@ #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sessions/session_types.h" #include "chrome/browser/sync/glue/favicon_cache.h" -#include "chrome/browser/sync/glue/model_associator.h" #include "chrome/browser/sync/glue/synced_session_tracker.h" #include "chrome/browser/sync/glue/tab_node_pool.h" #include "chrome/browser/sync/open_tabs_ui_delegate.h" +#include "components/sync_driver/model_associator.h" #include "sync/internal_api/public/base/model_type.h" class PrefServiceSyncable; diff --git a/chrome/browser/sync/glue/shared_change_processor.h b/chrome/browser/sync/glue/shared_change_processor.h index dccac66..d33125d 100644 --- a/chrome/browser/sync/glue/shared_change_processor.h +++ b/chrome/browser/sync/glue/shared_change_processor.h @@ -10,7 +10,7 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop_proxy.h" #include "base/synchronization/lock.h" -#include "chrome/browser/sync/glue/data_type_error_handler.h" +#include "components/sync_driver/data_type_error_handler.h" #include "sync/api/sync_change_processor.h" #include "sync/api/sync_error.h" #include "sync/api/sync_error_factory.h" diff --git a/chrome/browser/sync/glue/sync_backend_host.h b/chrome/browser/sync/glue/sync_backend_host.h index bd14103..0ace414 100644 --- a/chrome/browser/sync/glue/sync_backend_host.h +++ b/chrome/browser/sync/glue/sync_backend_host.h @@ -12,7 +12,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread.h" -#include "chrome/browser/sync/glue/backend_data_type_configurer.h" +#include "components/sync_driver/backend_data_type_configurer.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/configure_reason.h" #include "sync/internal_api/public/sessions/sync_session_snapshot.h" diff --git a/chrome/browser/sync/glue/sync_backend_host_impl.cc b/chrome/browser/sync/glue/sync_backend_host_impl.cc index 50f7df9..8aff13d 100644 --- a/chrome/browser/sync/glue/sync_backend_host_impl.cc +++ b/chrome/browser/sync/glue/sync_backend_host_impl.cc @@ -12,9 +12,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/glue/sync_backend_host_core.h" #include "chrome/browser/sync/glue/sync_backend_registrar.h" -#include "chrome/browser/sync/glue/sync_frontend.h" #include "chrome/browser/sync/sync_prefs.h" #include "chrome/common/chrome_switches.h" +#include "components/sync_driver/sync_frontend.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/sync/glue/sync_backend_host_impl.h b/chrome/browser/sync/glue/sync_backend_host_impl.h index 62436c9..d1fca6e 100644 --- a/chrome/browser/sync/glue/sync_backend_host_impl.h +++ b/chrome/browser/sync/glue/sync_backend_host_impl.h @@ -13,9 +13,9 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread.h" -#include "chrome/browser/sync/glue/backend_data_type_configurer.h" #include "chrome/browser/sync/glue/extensions_activity_monitor.h" #include "chrome/browser/sync/glue/sync_backend_host.h" +#include "components/sync_driver/backend_data_type_configurer.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "sync/internal_api/public/base/model_type.h" diff --git a/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc b/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc index b7bf9c4..d1a2bfe 100644 --- a/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc +++ b/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc @@ -16,10 +16,10 @@ #include "chrome/browser/invalidation/invalidator_storage.h" #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/browser/sync/glue/device_info.h" -#include "chrome/browser/sync/glue/sync_frontend.h" #include "chrome/browser/sync/glue/synced_device_tracker.h" #include "chrome/browser/sync/sync_prefs.h" #include "chrome/test/base/testing_profile.h" +#include "components/sync_driver/sync_frontend.h" #include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/chrome/browser/sync/glue/sync_backend_host_mock.cc b/chrome/browser/sync/glue/sync_backend_host_mock.cc index 15fbc42..7f21935 100644 --- a/chrome/browser/sync/glue/sync_backend_host_mock.cc +++ b/chrome/browser/sync/glue/sync_backend_host_mock.cc @@ -4,7 +4,7 @@ #include "chrome/browser/sync/glue/sync_backend_host_mock.h" -#include "chrome/browser/sync/glue/sync_frontend.h" +#include "components/sync_driver/sync_frontend.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/typed_url_change_processor.h b/chrome/browser/sync/glue/typed_url_change_processor.h index a5e447e..f86406c 100644 --- a/chrome/browser/sync/glue/typed_url_change_processor.h +++ b/chrome/browser/sync/glue/typed_url_change_processor.h @@ -10,9 +10,9 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "chrome/browser/sync/glue/data_type_error_handler.h" #include "chrome/browser/sync/glue/sync_backend_host.h" #include "chrome/browser/sync/glue/typed_url_model_associator.h" +#include "components/sync_driver/data_type_error_handler.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_types.h" diff --git a/chrome/browser/sync/glue/typed_url_model_associator.h b/chrome/browser/sync/glue/typed_url_model_associator.h index 5f9cd38..0c2f7cf 100644 --- a/chrome/browser/sync/glue/typed_url_model_associator.h +++ b/chrome/browser/sync/glue/typed_url_model_associator.h @@ -14,8 +14,8 @@ #include "base/compiler_specific.h" #include "base/strings/string16.h" #include "chrome/browser/history/history_types.h" -#include "chrome/browser/sync/glue/data_type_error_handler.h" -#include "chrome/browser/sync/glue/model_associator.h" +#include "components/sync_driver/data_type_error_handler.h" +#include "components/sync_driver/model_associator.h" #include "sync/protocol/typed_url_specifics.pb.h" class GURL; diff --git a/chrome/browser/sync/profile_sync_components_factory.h b/chrome/browser/sync/profile_sync_components_factory.h index 45834b1..3b91724 100644 --- a/chrome/browser/sync/profile_sync_components_factory.h +++ b/chrome/browser/sync/profile_sync_components_factory.h @@ -9,7 +9,7 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/sync/glue/data_type_controller.h" -#include "chrome/browser/sync/glue/data_type_error_handler.h" +#include "components/sync_driver/data_type_error_handler.h" #include "sync/api/sync_merge_result.h" #include "sync/internal_api/public/util/unrecoverable_error_handler.h" #include "sync/internal_api/public/util/weak_handle.h" diff --git a/chrome/browser/sync/profile_sync_components_factory_mock.cc b/chrome/browser/sync/profile_sync_components_factory_mock.cc index 3f492b4..10ca3fce 100644 --- a/chrome/browser/sync/profile_sync_components_factory_mock.cc +++ b/chrome/browser/sync/profile_sync_components_factory_mock.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "chrome/browser/sync/glue/change_processor.h" -#include "chrome/browser/sync/glue/model_associator.h" #include "chrome/browser/sync/profile_sync_components_factory_mock.h" +#include "components/sync_driver/model_associator.h" using browser_sync::AssociatorInterface; using browser_sync::ChangeProcessor; diff --git a/chrome/browser/sync/profile_sync_components_factory_mock.h b/chrome/browser/sync/profile_sync_components_factory_mock.h index 330847c..11d0a65 100644 --- a/chrome/browser/sync/profile_sync_components_factory_mock.h +++ b/chrome/browser/sync/profile_sync_components_factory_mock.h @@ -7,9 +7,9 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/sync/glue/data_type_controller.h" -#include "chrome/browser/sync/glue/data_type_error_handler.h" #include "chrome/browser/sync/profile_sync_components_factory.h" #include "chrome/browser/sync/profile_sync_service.h" +#include "components/sync_driver/data_type_error_handler.h" #include "testing/gmock/include/gmock/gmock.h" namespace browser_sync { diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 80c4d80..5857272 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -52,7 +52,6 @@ #include "chrome/browser/sync/sessions2/notification_service_sessions_router.h" #include "chrome/browser/sync/sessions2/sessions_sync_manager.h" #include "chrome/browser/sync/sync_global_error.h" -#include "chrome/browser/sync/user_selectable_sync_type.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" @@ -62,6 +61,7 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "components/sync_driver/user_selectable_sync_type.h" #include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h index e7e0bab..646dcbf 100644 --- a/chrome/browser/sync/profile_sync_service.h +++ b/chrome/browser/sync/profile_sync_service.h @@ -22,18 +22,18 @@ #include "base/timer/timer.h" #include "chrome/browser/sync/backend_unrecoverable_error_handler.h" #include "chrome/browser/sync/glue/data_type_controller.h" -#include "chrome/browser/sync/glue/data_type_encryption_handler.h" #include "chrome/browser/sync/glue/data_type_manager.h" #include "chrome/browser/sync/glue/data_type_manager_observer.h" #include "chrome/browser/sync/glue/failed_data_types_handler.h" #include "chrome/browser/sync/glue/sync_backend_host.h" -#include "chrome/browser/sync/glue/sync_frontend.h" #include "chrome/browser/sync/glue/synced_device_tracker.h" #include "chrome/browser/sync/profile_sync_service_base.h" #include "chrome/browser/sync/profile_sync_service_observer.h" #include "chrome/browser/sync/sessions2/sessions_sync_manager.h" #include "chrome/browser/sync/sync_prefs.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/sync_driver/data_type_encryption_handler.h" +#include "components/sync_driver/sync_frontend.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_types.h" diff --git a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc index 79c6b64..e893f43 100644 --- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc @@ -28,10 +28,10 @@ #include "chrome/browser/bookmarks/bookmark_test_helpers.h" #include "chrome/browser/sync/glue/bookmark_change_processor.h" #include "chrome/browser/sync/glue/bookmark_model_associator.h" -#include "chrome/browser/sync/glue/data_type_error_handler.h" #include "chrome/browser/sync/glue/data_type_error_handler_mock.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/testing_profile.h" +#include "components/sync_driver/data_type_error_handler.h" #include "content/public/test/test_browser_thread.h" #include "sync/api/sync_error.h" #include "sync/internal_api/public/change_record.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index c0a53aa..92c2544 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -34,6 +34,7 @@ '../components/components.gyp:precache_core', '../components/components.gyp:signin_core', '../components/components.gyp:startup_metric_utils', + '../components/components.gyp:sync_driver', '../components/components.gyp:translate_core_browser', '../components/components.gyp:translate_core_common', '../components/components.gyp:user_prefs', @@ -2185,8 +2186,6 @@ 'browser/sync/glue/autofill_data_type_controller.h', 'browser/sync/glue/autofill_profile_data_type_controller.cc', 'browser/sync/glue/autofill_profile_data_type_controller.h', - 'browser/sync/glue/backend_data_type_configurer.cc', - 'browser/sync/glue/backend_data_type_configurer.h', 'browser/sync/glue/bookmark_change_processor.cc', 'browser/sync/glue/bookmark_change_processor.h', 'browser/sync/glue/bookmark_data_type_controller.cc', @@ -2203,9 +2202,6 @@ 'browser/sync/glue/chrome_report_unrecoverable_error.h', 'browser/sync/glue/data_type_controller.cc', 'browser/sync/glue/data_type_controller.h', - 'browser/sync/glue/data_type_encryption_handler.cc', - 'browser/sync/glue/data_type_encryption_handler.h', - 'browser/sync/glue/data_type_error_handler.h', 'browser/sync/glue/data_type_manager.cc', 'browser/sync/glue/data_type_manager.h', 'browser/sync/glue/data_type_manager_impl.cc', @@ -2231,7 +2227,6 @@ 'browser/sync/glue/history_model_worker.h', 'browser/sync/glue/model_association_manager.cc', 'browser/sync/glue/model_association_manager.h', - 'browser/sync/glue/model_associator.h', 'browser/sync/glue/non_frontend_data_type_controller.cc', 'browser/sync/glue/non_frontend_data_type_controller.h', 'browser/sync/glue/non_ui_data_type_controller.cc', @@ -2266,8 +2261,6 @@ 'browser/sync/glue/sync_backend_host_impl.h', 'browser/sync/glue/sync_backend_registrar.cc', 'browser/sync/glue/sync_backend_registrar.h', - 'browser/sync/glue/sync_frontend.h', - 'browser/sync/glue/sync_frontend.cc', 'browser/sync/glue/sync_start_util.cc', 'browser/sync/glue/sync_start_util.h', 'browser/sync/glue/synced_device_tracker.cc', @@ -2330,7 +2323,6 @@ 'browser/sync/sync_startup_tracker.h', 'browser/sync/sync_ui_util.cc', 'browser/sync/sync_ui_util.h', - 'browser/sync/user_selectable_sync_type.h', 'browser/sync_file_system/conflict_resolution_policy.h', 'browser/sync_file_system/conflict_resolution_resolver.cc', 'browser/sync_file_system/conflict_resolution_resolver.h', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 2d97512..4177980 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -19,6 +19,7 @@ '../base/base.gyp:base_prefs_test_support', '../base/base.gyp:test_support_base', '../components/components.gyp:password_manager_core_test_support', + '../components/components.gyp:sync_driver_test_support', '../content/content.gyp:content_app_both', '../content/content_shell_and_tests.gyp:test_support_content', '../net/net.gyp:net', @@ -1303,8 +1304,6 @@ 'browser/sync/glue/frontend_data_type_controller_unittest.cc', 'browser/sync/glue/generic_change_processor_unittest.cc', 'browser/sync/glue/model_association_manager_unittest.cc', - 'browser/sync/glue/model_associator_mock.cc', - 'browser/sync/glue/model_associator_mock.h', 'browser/sync/glue/non_frontend_data_type_controller_mock.cc', 'browser/sync/glue/non_frontend_data_type_controller_mock.h', 'browser/sync/glue/non_frontend_data_type_controller_unittest.cc', diff --git a/components/OWNERS b/components/OWNERS index 34f96b7..3e53d93 100644 --- a/components/OWNERS +++ b/components/OWNERS @@ -63,6 +63,11 @@ per-file signin*=atwilson@chromium.org per-file signin*=tim@chromium.org per-file signin*=rogerta@chromium.org +per-file sync_driver*=haitaol@chromium.org +per-file sync_driver*=rlarocque@chromium.org +per-file sync_driver*=tim@chromium.org +per-file sync_driver*=zea@chromium.org + per-file tracing*=jbauman@chromium.org per-file tracing*=nduca@chromium.org diff --git a/components/components.gyp b/components/components.gyp index da88385..86c0c6a 100644 --- a/components/components.gyp +++ b/components/components.gyp @@ -43,5 +43,12 @@ 'wifi.gypi', ], }], + ['android_webview_build == 0', { + # Android WebView fails to build if a dependency on sync.gyp:sync is + # introduced. + 'includes': [ + 'sync_driver.gypi', + ], + }], ], } diff --git a/components/components_tests.gyp b/components/components_tests.gyp index 5c18c9b..526735f 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -112,6 +112,9 @@ # Dependencies of signin 'components.gyp:signin_core', + # Dependencies of sync_driver + 'components.gyp:sync_driver_test_support', + # Dependencies of translate. 'components.gyp:translate_core_browser', 'components.gyp:translate_core_common', diff --git a/components/sync_driver.gypi b/components/sync_driver.gypi new file mode 100644 index 0000000..cadde22 --- /dev/null +++ b/components/sync_driver.gypi @@ -0,0 +1,48 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'targets': [ + { + 'target_name': 'sync_driver', + 'type': 'static_library', + 'dependencies': [ + '../base/base.gyp:base', + '../sync/sync.gyp:sync', + ], + 'include_dirs': [ + '..', + ], + 'sources': [ + 'sync_driver/backend_data_type_configurer.cc', + 'sync_driver/backend_data_type_configurer.h', + 'sync_driver/data_type_encryption_handler.cc', + 'sync_driver/data_type_encryption_handler.h', + 'sync_driver/data_type_error_handler.h', + 'sync_driver/model_associator.h', + 'sync_driver/sync_frontend.h', + 'sync_driver/sync_frontend.cc', + 'sync_driver/user_selectable_sync_type.h', + ], + }, + { + 'target_name': 'sync_driver_test_support', + 'type': 'static_library', + 'dependencies': [ + 'sync_driver', + '../base/base.gyp:base', + '../sync/sync.gyp:sync', + '../testing/gmock.gyp:gmock', + '../testing/gtest.gyp:gtest', + ], + 'include_dirs': [ + '..', + ], + 'sources': [ + 'sync_driver/model_associator_mock.cc', + 'sync_driver/model_associator_mock.h', + ], + }, + ], +} diff --git a/components/sync_driver/DEPS b/components/sync_driver/DEPS new file mode 100644 index 0000000..067cea9 --- /dev/null +++ b/components/sync_driver/DEPS @@ -0,0 +1,5 @@ +include_rules = [ + # SyncDriver is used by iOS, which does not use content. + "-content", + "+sync", +] diff --git a/components/sync_driver/OWNERS b/components/sync_driver/OWNERS new file mode 100644 index 0000000..a027317 --- /dev/null +++ b/components/sync_driver/OWNERS @@ -0,0 +1,4 @@ +haitaol@chromium.org +rlarocque@chromium.org +tim@chromium.org +zea@chromium.org diff --git a/chrome/browser/sync/glue/backend_data_type_configurer.cc b/components/sync_driver/backend_data_type_configurer.cc index b083b1a..189e482 100644 --- a/chrome/browser/sync/glue/backend_data_type_configurer.cc +++ b/components/sync_driver/backend_data_type_configurer.cc @@ -1,9 +1,9 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/sync/glue/backend_data_type_configurer.h" +#include "components/sync_driver/backend_data_type_configurer.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/backend_data_type_configurer.h b/components/sync_driver/backend_data_type_configurer.h index eb4d93e..ac3128d 100644 --- a/chrome/browser/sync/glue/backend_data_type_configurer.h +++ b/components/sync_driver/backend_data_type_configurer.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_SYNC_GLUE_BACKEND_DATA_TYPE_CONFIGURER_H_ -#define CHROME_BROWSER_SYNC_GLUE_BACKEND_DATA_TYPE_CONFIGURER_H_ +#ifndef COMPONENTS_SYNC_DRIVER_BACKEND_DATA_TYPE_CONFIGURER_H_ +#define COMPONENTS_SYNC_DRIVER_BACKEND_DATA_TYPE_CONFIGURER_H_ #include <map> @@ -66,4 +66,4 @@ class BackendDataTypeConfigurer { } // namespace browser_sync -#endif // CHROME_BROWSER_SYNC_GLUE_BACKEND_DATA_TYPE_CONFIGURER_H_ +#endif // COMPONENTS_SYNC_DRIVER_BACKEND_DATA_TYPE_CONFIGURER_H_ diff --git a/chrome/browser/sync/glue/data_type_encryption_handler.cc b/components/sync_driver/data_type_encryption_handler.cc index a47bf7f..8920dc6 100644 --- a/chrome/browser/sync/glue/data_type_encryption_handler.cc +++ b/components/sync_driver/data_type_encryption_handler.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/sync/glue/data_type_encryption_handler.h" +#include "components/sync_driver/data_type_encryption_handler.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/data_type_encryption_handler.h b/components/sync_driver/data_type_encryption_handler.h index c5c4169..a4eff7d 100644 --- a/chrome/browser/sync/glue/data_type_encryption_handler.h +++ b/components/sync_driver/data_type_encryption_handler.h @@ -1,9 +1,9 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_SYNC_GLUE_DATA_TYPE_ENCRYPTION_HANDLER_H_ -#define CHROME_BROWSER_SYNC_GLUE_DATA_TYPE_ENCRYPTION_HANDLER_H_ +#ifndef COMPONENTS_SYNC_DRIVER_DATA_TYPE_ENCRYPTION_HANDLER_H_ +#define COMPONENTS_SYNC_DRIVER_DATA_TYPE_ENCRYPTION_HANDLER_H_ #include "base/basictypes.h" #include "sync/internal_api/public/base/model_type.h" @@ -26,4 +26,4 @@ class DataTypeEncryptionHandler { } // namespace browser_sync -#endif // CHROME_BROWSER_SYNC_GLUE_DATA_TYPE_ENCRYPTION_HANDLER_H_ +#endif // COMPONENTS_SYNC_DRIVER_DATA_TYPE_ENCRYPTION_HANDLER_H_ diff --git a/chrome/browser/sync/glue/data_type_error_handler.h b/components/sync_driver/data_type_error_handler.h index 753417b..88733b7 100644 --- a/chrome/browser/sync/glue/data_type_error_handler.h +++ b/components/sync_driver/data_type_error_handler.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_SYNC_GLUE_DATA_TYPE_ERROR_HANDLER_H__ -#define CHROME_BROWSER_SYNC_GLUE_DATA_TYPE_ERROR_HANDLER_H__ +#ifndef COMPONENTS_SYNC_DRIVER_DATA_TYPE_ERROR_HANDLER_H__ +#define COMPONENTS_SYNC_DRIVER_DATA_TYPE_ERROR_HANDLER_H__ #include <string> #include "base/location.h" @@ -35,4 +35,4 @@ class DataTypeErrorHandler { }; } // namespace browser_sync -#endif // CHROME_BROWSER_SYNC_GLUE_DATA_TYPE_ERROR_HANDLER_H__ +#endif // COMPONENTS_SYNC_DRIVER_DATA_TYPE_ERROR_HANDLER_H__ diff --git a/chrome/browser/sync/glue/model_associator.h b/components/sync_driver/model_associator.h index 5aa5eeb..b7ec7b6 100644 --- a/chrome/browser/sync/glue/model_associator.h +++ b/components/sync_driver/model_associator.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCIATOR_H_ -#define CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCIATOR_H_ +#ifndef COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATOR_H_ +#define COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATOR_H_ #include "base/basictypes.h" #include "base/synchronization/lock.h" @@ -92,4 +92,4 @@ class PerDataTypeAssociatorInterface : public AssociatorInterface { } // namespace browser_sync -#endif // CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCIATOR_H_ +#endif // COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATOR_H_ diff --git a/chrome/browser/sync/glue/model_associator_mock.cc b/components/sync_driver/model_associator_mock.cc index f05ede4..199555b 100644 --- a/chrome/browser/sync/glue/model_associator_mock.cc +++ b/components/sync_driver/model_associator_mock.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/sync/glue/model_associator_mock.h" +#include "components/sync_driver/model_associator_mock.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/model_associator_mock.h b/components/sync_driver/model_associator_mock.h index 1f5a6e7..ba35d4b 100644 --- a/chrome/browser/sync/glue/model_associator_mock.h +++ b/components/sync_driver/model_associator_mock.h @@ -1,12 +1,12 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCIATOR_MOCK_H__ -#define CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCIATOR_MOCK_H__ +#ifndef COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATOR_MOCK_H__ +#define COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATOR_MOCK_H__ #include "base/location.h" -#include "chrome/browser/sync/glue/model_associator.h" +#include "components/sync_driver/model_associator.h" #include "sync/api/sync_error.h" #include "testing/gmock/include/gmock/gmock.h" @@ -32,4 +32,4 @@ class ModelAssociatorMock : public AssociatorInterface { } // namespace browser_sync -#endif // CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCIATOR_MOCK_H__ +#endif // COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATOR_MOCK_H__ diff --git a/chrome/browser/sync/glue/sync_frontend.cc b/components/sync_driver/sync_frontend.cc index 8241c74..33a76c1 100644 --- a/chrome/browser/sync/glue/sync_frontend.cc +++ b/components/sync_driver/sync_frontend.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/sync/glue/sync_frontend.h" +#include "components/sync_driver/sync_frontend.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/sync_frontend.h b/components/sync_driver/sync_frontend.h index db9d0cb..2b30df1 100644 --- a/chrome/browser/sync/glue/sync_frontend.h +++ b/components/sync_driver/sync_frontend.h @@ -1,9 +1,9 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_SYNC_GLUE_SYNC_FRONTEND_H_ -#define CHROME_BROWSER_SYNC_GLUE_SYNC_FRONTEND_H_ +#ifndef COMPONENTS_SYNC_DRIVER_SYNC_FRONTEND_H_ +#define COMPONENTS_SYNC_DRIVER_SYNC_FRONTEND_H_ #include "base/basictypes.h" #include "sync/internal_api/public/base/model_type.h" @@ -109,4 +109,4 @@ class SyncFrontend { } // namespace browser_sync -#endif // CHROME_BROWSER_SYNC_GLUE_SYNC_FRONTEND_H_ +#endif // COMPONENTS_SYNC_DRIVER_SYNC_FRONTEND_H_ diff --git a/chrome/browser/sync/user_selectable_sync_type.h b/components/sync_driver/user_selectable_sync_type.h index ce22042..77e87df 100644 --- a/chrome/browser/sync/user_selectable_sync_type.h +++ b/components/sync_driver/user_selectable_sync_type.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_SYNC_USER_SELECTABLE_SYNC_TYPE_H_ -#define CHROME_BROWSER_SYNC_USER_SELECTABLE_SYNC_TYPE_H_ +#ifndef COMPONENTS_SYNC_DRIVER_USER_SELECTABLE_SYNC_TYPE_H_ +#define COMPONENTS_SYNC_DRIVER_USER_SELECTABLE_SYNC_TYPE_H_ namespace browser_sync { namespace user_selectable_type { @@ -63,4 +63,4 @@ enum UserSelectableSyncType { } // namespace user_selectable_type } // namespace browser_sync -#endif // CHROME_BROWSER_SYNC_USER_SELECTABLE_SYNC_TYPE_H_ +#endif // COMPONENTS_SYNC_DRIVER_USER_SELECTABLE_SYNC_TYPE_H_ diff --git a/sync/internal_api/public/base/model_type.h b/sync/internal_api/public/base/model_type.h index dddc617..a29d6a0 100644 --- a/sync/internal_api/public/base/model_type.h +++ b/sync/internal_api/public/base/model_type.h @@ -137,10 +137,10 @@ enum ModelType { // If you are adding a new sync datatype that is exposed to the user via the // sync preferences UI, be sure to update the list in - // chrome/browser/sync/user_selectable_sync_type.h so that the UMA histograms - // for sync include your new type. - // In this case, be sure to also update the UserSelectableTypes() definition - // in sync/syncable/model_type.cc. + // components/sync_driver/user_selectable_sync_type.h so that the UMA + // histograms for sync include your new type. In this case, be sure to also + // update the UserSelectableTypes() definition in + // sync/syncable/model_type.cc. MODEL_TYPE_COUNT, }; |