• Home
  • History
  • Annotate
  • only in /external/chromium_org/chrome/browser/sync/
History log of /external/chromium_org/chrome/browser/sync/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
e4256316f8b5e8d1ec0df1f7762771622a53fa63 22-Nov-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.90

This commit was generated by merge_to_master.py.

Change-Id: I1bb301dcfe74249d8b66fb60ba577e9095c86b8d
est/integration/enable_disable_test.cc
5b892326406927b709cdaf6c384d4ababf456332 06-Nov-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.53

This commit was generated by merge_to_master.py.

Change-Id: Id583a0dc312e50e455eb8bd04f75c74304738c9d
lue/browser_thread_model_worker.cc
lue/history_model_worker.cc
lue/password_model_worker.cc
lue/sync_backend_registrar_unittest.cc
lue/ui_model_worker.cc
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_unittest.cc
ab8f6f0bd665d3c1ff476eb06c58c42630e462d4 29-Oct-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.44

This commit was generated by merge_to_master.py.

Change-Id: I12ecf158017b8be5f9a1d33f4152e5a3c812cb7f
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_android.cc
rofile_sync_service_android.h
rofile_sync_service_mock.h
5b62eb5758cb7b791cfdd45cf78f35dc060631b6 27-Oct-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.38

This commit was generated by merge_to_master.py.

Change-Id: Id34e308a78a8e250aa0f0b60fcb9f882fc35382e
rofile_sync_service_android.cc
rofile_sync_service_android.h
34680572440d7894ef8dafce81d8039ed80726a2 14-Oct-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 39.0.2171.26

This commit was generated by merge_to_master.py.

Change-Id: I7e2a210cf0e24a4fbfd446a03aab3b29edbdd13a
lue/bookmark_data_type_controller_unittest.cc
lue/frontend_data_type_controller.cc
lue/frontend_data_type_controller_unittest.cc
lue/search_engine_data_type_controller_unittest.cc
1320f92c476a1ad9d19dba2a48c72b75566198e9 30-Sep-2014 Primiano Tucci <primiano@google.com> Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
lue/bookmark_change_processor.cc
lue/bookmark_change_processor.h
lue/bookmark_data_type_controller_unittest.cc
lue/bookmark_model_associator.cc
lue/chrome_report_unrecoverable_error.cc
lue/device_info.cc
lue/device_info.h
lue/device_info_data_type_controller.cc
lue/device_info_data_type_controller.h
lue/device_info_data_type_controller_unittest.cc
lue/device_info_sync_service.cc
lue/device_info_sync_service.h
lue/device_info_sync_service_unittest.cc
lue/device_info_tracker.h
lue/favicon_cache.cc
lue/favicon_cache.h
lue/frontend_data_type_controller.cc
lue/history_delete_directives_data_type_controller.cc
lue/history_delete_directives_data_type_controller.h
lue/local_device_info_provider.h
lue/local_device_info_provider_impl.cc
lue/local_device_info_provider_impl.h
lue/local_device_info_provider_mock.cc
lue/local_device_info_provider_mock.h
lue/local_device_info_provider_unittest.cc
lue/non_frontend_data_type_controller.cc
lue/password_data_type_controller.cc
lue/search_engine_data_type_controller_unittest.cc
lue/session_sync_test_helper.cc
lue/sync_backend_host.h
lue/sync_backend_host_core.cc
lue/sync_backend_host_core.h
lue/sync_backend_host_impl.cc
lue/sync_backend_host_impl.h
lue/sync_backend_host_impl_unittest.cc
lue/sync_backend_host_mock.cc
lue/sync_backend_host_mock.h
lue/synced_device_tracker.cc
lue/synced_device_tracker.h
lue/synced_device_tracker_unittest.cc
lue/typed_url_change_processor.cc
lue/typed_url_data_type_controller.cc
lue/typed_url_data_type_controller.h
lue/typed_url_model_associator.cc
lue/typed_url_model_associator.h
lue/typed_url_model_associator_unittest.cc
rofile_sync_components_factory.h
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl.h
rofile_sync_components_factory_impl_unittest.cc
rofile_sync_components_factory_mock.cc
rofile_sync_components_factory_mock.h
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_android.cc
rofile_sync_service_android.h
rofile_sync_service_android_unittest.cc
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_mock.cc
rofile_sync_service_mock.h
rofile_sync_service_model_type_selection_android.h
rofile_sync_service_startup_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
essions/notification_service_sessions_router.cc
essions/notification_service_sessions_router.h
essions/session_data_type_controller.cc
essions/session_data_type_controller.h
essions/sessions_sync_manager.cc
essions/sessions_sync_manager.h
essions/sessions_sync_manager_unittest.cc
upervised_user_signin_manager_wrapper.cc
ync_ui_util.cc
est/integration/bookmarks_helper.cc
est/integration/bookmarks_helper.h
est/integration/enable_disable_test.cc
est/integration/migration_test.cc
est/integration/migration_waiter.cc
est/integration/migration_waiter.h
est/integration/migration_watcher.cc
est/integration/migration_watcher.h
est/integration/multiple_client_typed_urls_sync_test.cc
est/integration/performance/sessions_sync_perf_test.cc
est/integration/profile_sync_service_harness.cc
est/integration/single_client_backup_rollback_test.cc
est/integration/single_client_sessions_sync_test.cc
est/integration/single_client_typed_urls_sync_test.cc
est/integration/sync_errors_test.cc
est/integration/sync_extension_helper.cc
est/integration/two_client_apps_sync_test.cc
est/integration/two_client_bookmarks_sync_test.cc
est/integration/two_client_typed_urls_sync_test.cc
est/integration/typed_urls_helper.cc
est/integration/typed_urls_helper.h
est_profile_sync_service.h
03b57e008b61dfcb1fbad3aea950ae0e001748b0 28-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 291560

This commit was generated by merge_to_master.py.

Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
ackup_rollback_controller.h
lue/favicon_cache.h
lue/non_frontend_data_type_controller.cc
lue/non_frontend_data_type_controller_unittest.cc
lue/session_sync_test_helper.h
lue/synced_session.h
lue/synced_session_tracker.cc
lue/synced_session_tracker.h
lue/synced_tab_delegate.h
lue/synced_window_delegate.h
lue/synced_window_delegate_android.h
pen_tabs_ui_delegate.h
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_android.cc
rofile_sync_service_android.h
rofile_sync_service_unittest.cc
essions/sessions_sync_manager.cc
essions/sessions_sync_manager.h
essions/sessions_sync_manager_unittest.cc
essions/tab_node_pool.h
ync_error_notifier_ash.cc
ync_global_error.cc
ync_ui_util.cc
ync_ui_util_unittest.cc
est/integration/single_client_backup_rollback_test.cc
est/integration/sync_app_helper.cc
est/integration/sync_auth_test.cc
est/integration/sync_extension_helper.cc
est/integration/themes_helper.cc
6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 19-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 290040

This commit was generated by merge_to_master.py.

Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
RESUBMIT.py
ackend_migrator.cc
ackend_migrator_unittest.cc
ackup_rollback_controller.cc
ackup_rollback_controller.h
ackup_rollback_controller_unittest.cc
lue/autofill_data_type_controller.cc
lue/autofill_data_type_controller.h
lue/autofill_data_type_controller_unittest.cc
lue/autofill_profile_data_type_controller.cc
lue/autofill_profile_data_type_controller.h
lue/bookmark_change_processor.cc
lue/bookmark_data_type_controller_unittest.cc
lue/bookmark_model_associator.cc
lue/chrome_report_unrecoverable_error.cc
lue/device_info_data_type_controller.cc
lue/device_info_data_type_controller.h
lue/device_info_data_type_controller_unittest.cc
lue/extension_backed_data_type_controller.cc
lue/extension_backed_data_type_controller.h
lue/extension_data_type_controller.cc
lue/extension_data_type_controller.h
lue/extension_setting_data_type_controller.cc
lue/extension_setting_data_type_controller.h
lue/frontend_data_type_controller.cc
lue/frontend_data_type_controller.h
lue/frontend_data_type_controller_mock.h
lue/frontend_data_type_controller_unittest.cc
lue/non_frontend_data_type_controller.cc
lue/non_frontend_data_type_controller.h
lue/non_frontend_data_type_controller_mock.h
lue/non_frontend_data_type_controller_unittest.cc
lue/password_data_type_controller.cc
lue/password_data_type_controller.h
lue/search_engine_data_type_controller.cc
lue/search_engine_data_type_controller.h
lue/search_engine_data_type_controller_unittest.cc
lue/sync_backend_host_core.cc
lue/theme_data_type_controller.cc
lue/theme_data_type_controller.h
lue/typed_url_change_processor.cc
lue/typed_url_data_type_controller.cc
rofile_sync_components_factory_impl.cc
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_unittest.cc
essions/session_data_type_controller.cc
essions/session_data_type_controller.h
essions/session_data_type_controller_unittest.cc
essions/sessions_sync_manager.cc
essions/sessions_sync_manager.h
essions/sessions_sync_manager_unittest.cc
tartup_controller.cc
tartup_controller.h
tartup_controller_unittest.cc
ync_error_notifier_ash.cc
ync_type_preference_provider.h
ync_ui_util.cc
est/integration/migration_test.cc
est/integration/profile_sync_service_harness.cc
est/integration/single_client_backup_rollback_test.cc
est_profile_sync_service.cc
est_profile_sync_service.h
5f1c94371a64b3196d4be9466099bb892df9b88e 12-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854
RESUBMIT.py
ackend_migrator.cc
ackend_migrator.h
ackend_migrator_unittest.cc
ackup_rollback_controller.cc
ackup_rollback_controller_unittest.cc
lue/autofill_data_type_controller.h
lue/autofill_data_type_controller_unittest.cc
lue/autofill_profile_data_type_controller.h
lue/bookmark_change_processor.cc
lue/bookmark_change_processor.h
lue/bookmark_data_type_controller_unittest.cc
lue/bookmark_model_associator.cc
lue/bookmark_model_associator.h
lue/device_info.cc
lue/device_info.h
lue/device_info_data_type_controller.cc
lue/device_info_data_type_controller.h
lue/device_info_data_type_controller_unittest.cc
lue/device_info_sync_service.cc
lue/device_info_sync_service.h
lue/device_info_sync_service_unittest.cc
lue/device_info_tracker.h
lue/extension_backed_data_type_controller.cc
lue/extension_backed_data_type_controller.h
lue/extension_data_type_controller.cc
lue/extension_data_type_controller.h
lue/extension_setting_data_type_controller.h
lue/extensions_activity_monitor.cc
lue/extensions_activity_monitor_unittest.cc
lue/favicon_cache_unittest.cc
lue/frontend_data_type_controller.cc
lue/frontend_data_type_controller.h
lue/frontend_data_type_controller_mock.h
lue/frontend_data_type_controller_unittest.cc
lue/history_model_worker.cc
lue/invalidation_adapter.h
lue/invalidation_helper.cc
lue/invalidation_helper.h
lue/local_device_info_provider.h
lue/local_device_info_provider_impl.cc
lue/local_device_info_provider_impl.h
lue/local_device_info_provider_mock.cc
lue/local_device_info_provider_mock.h
lue/local_device_info_provider_unittest.cc
lue/non_frontend_data_type_controller.cc
lue/non_frontend_data_type_controller.h
lue/non_frontend_data_type_controller_mock.h
lue/non_frontend_data_type_controller_unittest.cc
lue/password_data_type_controller.h
lue/search_engine_data_type_controller.cc
lue/search_engine_data_type_controller.h
lue/search_engine_data_type_controller_unittest.cc
lue/sync_backend_host.h
lue/sync_backend_host_core.cc
lue/sync_backend_host_core.h
lue/sync_backend_host_impl.cc
lue/sync_backend_host_impl.h
lue/sync_backend_host_impl_unittest.cc
lue/sync_backend_host_mock.cc
lue/sync_backend_host_mock.h
lue/sync_backend_registrar.cc
lue/sync_backend_registrar.h
lue/sync_backend_registrar_unittest.cc
lue/synced_device_tracker.cc
lue/synced_device_tracker.h
lue/synced_device_tracker_unittest.cc
lue/theme_data_type_controller.cc
lue/theme_data_type_controller.h
lue/typed_url_change_processor.cc
lue/typed_url_change_processor.h
lue/typed_url_data_type_controller.cc
lue/typed_url_data_type_controller.h
lue/typed_url_model_associator.cc
lue/typed_url_model_associator.h
lue/typed_url_model_associator_unittest.cc
rofile_sync_components_factory.h
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl.h
rofile_sync_components_factory_impl_unittest.cc
rofile_sync_components_factory_mock.cc
rofile_sync_components_factory_mock.h
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_android.h
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_factory.cc
rofile_sync_service_mock.cc
rofile_sync_service_mock.h
rofile_sync_service_startup_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
essions/notification_service_sessions_router.h
essions/session_data_type_controller.cc
essions/session_data_type_controller.h
essions/session_data_type_controller_unittest.cc
essions/sessions_sync_manager.cc
essions/sessions_sync_manager.h
essions/sessions_sync_manager_unittest.cc
est/integration/apps_helper.cc
est/integration/apps_helper.h
est/integration/bookmarks_helper.cc
est/integration/enable_disable_test.cc
est/integration/extensions_helper.cc
est/integration/fake_server_invalidation_service.cc
est/integration/multiple_client_preferences_sync_test.cc
est/integration/p2p_invalidation_forwarder.cc
est/integration/single_client_backup_rollback_test.cc
est/integration/sync_errors_test.cc
est/integration/sync_extension_helper.cc
est/integration/sync_extension_installer.cc
est/integration/sync_test.cc
est/integration/sync_test.h
est/integration/themes_helper.cc
est/integration/two_client_app_list_sync_test.cc
est/integration/two_client_apps_sync_test.cc
est/integration/two_client_preferences_sync_test.cc
est/integration/typed_urls_helper.cc
est_profile_sync_service.cc
est_profile_sync_service.h
116680a4aac90f2aa7413d9095a592090648e557 21-Jul-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
EPS
ackend_migrator.cc
ackup_rollback_controller.cc
ackup_rollback_controller.h
ackup_rollback_controller_unittest.cc
lue/DEPS
lue/autofill_data_type_controller_unittest.cc
lue/extension_backed_data_type_controller.cc
lue/extension_backed_data_type_controller.h
lue/favicon_cache.cc
lue/history_model_worker.cc
lue/history_model_worker.h
lue/invalidation_adapter.cc
lue/invalidation_adapter.h
lue/non_frontend_data_type_controller_unittest.cc
lue/search_engine_data_type_controller.cc
lue/search_engine_data_type_controller.h
lue/search_engine_data_type_controller_unittest.cc
lue/sync_backend_host.h
lue/sync_backend_host_core.cc
lue/sync_backend_host_impl.cc
lue/sync_backend_host_impl.h
lue/sync_backend_host_impl_unittest.cc
lue/sync_backend_host_mock.cc
lue/sync_backend_host_mock.h
lue/sync_backend_registrar.cc
lue/synced_device_tracker.cc
lue/synced_device_tracker.h
lue/synced_device_tracker_unittest.cc
lue/typed_url_change_processor.h
lue/typed_url_data_type_controller.cc
lue/typed_url_data_type_controller.h
lue/typed_url_model_associator.cc
lue/typed_url_model_associator.h
anaged_user_signin_manager_wrapper.cc
anaged_user_signin_manager_wrapper.h
rofile_sync_components_factory.h
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl.h
rofile_sync_components_factory_impl_unittest.cc
rofile_sync_components_factory_mock.cc
rofile_sync_components_factory_mock.h
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_android.cc
rofile_sync_service_android.h
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_factory.cc
rofile_sync_service_mock.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
tartup_controller.cc
tartup_controller.h
tartup_controller_unittest.cc
upervised_user_signin_manager_wrapper.cc
upervised_user_signin_manager_wrapper.h
ync_error_notifier_ash.cc
ync_error_notifier_ash_unittest.cc
ync_policy_handler_unittest.cc
est/integration/bookmarks_helper.cc
est/integration/enable_disable_test.cc
est/integration/extensions_helper.cc
est/integration/extensions_helper.h
est/integration/fake_server_invalidation_service.cc
est/integration/migration_test.cc
est/integration/preferences_helper.cc
est/integration/preferences_helper.h
est/integration/search_engines_helper.cc
est/integration/single_client_backup_rollback_test.cc
est/integration/single_client_managed_user_settings_sync_test.cc
est/integration/single_client_search_engines_sync_test.cc
est/integration/single_client_supervised_user_settings_sync_test.cc
est/integration/status_change_checker.cc
est/integration/status_change_checker.h
est/integration/sync_extension_helper.cc
est/integration/sync_extension_helper.h
est/integration/sync_extension_installer.cc
est/integration/sync_extension_installer.h
est/integration/sync_test.cc
est/integration/sync_test.h
est/integration/themes_helper.cc
est/integration/themes_helper.h
est/integration/two_client_apps_sync_test.cc
est/integration/two_client_extensions_sync_test.cc
est/integration/two_client_preferences_sync_test.cc
est/integration/two_client_search_engines_sync_test.cc
est/integration/two_client_themes_sync_test.cc
est/integration/typed_urls_helper.cc
est_profile_sync_service.cc
6d86b77056ed63eb6871182f42a9fd5f07550f90 25-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
bout_sync_util_unittest.cc
ackup_rollback_controller.cc
ackup_rollback_controller_unittest.cc
lue/bookmark_data_type_controller_unittest.cc
lue/extensions_activity_monitor_unittest.cc
lue/frontend_data_type_controller.cc
lue/frontend_data_type_controller_unittest.cc
lue/non_frontend_data_type_controller.cc
lue/non_frontend_data_type_controller_unittest.cc
lue/sync_backend_host_impl.cc
lue/sync_backend_registrar_unittest.cc
lue/typed_url_data_type_controller.cc
lue/typed_url_model_associator_unittest.cc
rofile_sync_components_factory_impl.cc
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_mock.h
rofile_sync_service_unittest.cc
ync_error_notifier_ash_unittest.cc
est/integration/bookmarks_helper.cc
est/integration/single_client_backup_rollback_test.cc
est/integration/two_client_autofill_sync_test.cc
f8ee788a64d60abd8f2d742a5fdedde054ecd910 20-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
ackup_rollback_controller.cc
ackup_rollback_controller_unittest.cc
lue/autofill_data_type_controller.cc
lue/autofill_data_type_controller.h
lue/autofill_data_type_controller_unittest.cc
lue/autofill_profile_data_type_controller.cc
lue/autofill_profile_data_type_controller.h
lue/bookmark_change_processor.cc
lue/bookmark_change_processor.h
lue/bookmark_data_type_controller_unittest.cc
lue/bookmark_model_associator.cc
lue/extension_data_type_controller.cc
lue/extension_data_type_controller.h
lue/extension_setting_data_type_controller.cc
lue/extension_setting_data_type_controller.h
lue/favicon_cache.cc
lue/favicon_cache.h
lue/favicon_cache_unittest.cc
lue/frontend_data_type_controller.cc
lue/frontend_data_type_controller.h
lue/non_frontend_data_type_controller.cc
lue/non_frontend_data_type_controller.h
lue/non_ui_data_type_controller.cc
lue/non_ui_data_type_controller.h
lue/non_ui_data_type_controller_mock.cc
lue/non_ui_data_type_controller_mock.h
lue/non_ui_data_type_controller_unittest.cc
lue/password_data_type_controller.cc
lue/password_data_type_controller.h
lue/search_engine_data_type_controller.cc
lue/search_engine_data_type_controller.h
lue/search_engine_data_type_controller_unittest.cc
lue/sync_backend_host_core.cc
lue/sync_backend_host_impl_unittest.cc
lue/synced_tab_delegate.h
lue/synced_tab_delegate_android.cc
lue/synced_tab_delegate_android.h
lue/theme_data_type_controller.cc
lue/theme_data_type_controller.h
lue/ui_data_type_controller.cc
lue/ui_data_type_controller.h
lue/ui_data_type_controller_unittest.cc
anaged_user_signin_manager_wrapper.cc
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl.h
rofile_sync_components_factory_impl_unittest.cc
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_factory.cc
rofile_sync_service_mock.cc
rofile_sync_service_mock.h
rofile_sync_service_startup_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
essions/notification_service_sessions_router.cc
essions/session_data_type_controller.cc
essions/session_data_type_controller.h
essions/sessions_sync_manager.cc
essions/sessions_sync_manager_unittest.cc
essions/sessions_util.cc
tartup_controller_unittest.cc
est/integration/bookmarks_helper.cc
est/integration/bookmarks_helper.h
est/integration/cross_platform_sync_test.cc
est/integration/enable_disable_test.cc
est/integration/fake_server_invalidation_service.cc
est/integration/fake_server_invalidation_service.h
est/integration/multiple_client_bookmarks_sync_test.cc
est/integration/passwords_helper.cc
est/integration/performance/bookmarks_sync_perf_test.cc
est/integration/profile_sync_service_harness.cc
est/integration/search_engines_helper.cc
est/integration/single_client_backup_rollback_test.cc
est/integration/single_client_bookmarks_sync_test.cc
est/integration/single_client_managed_user_settings_sync_test.cc
est/integration/sync_auth_test.cc
est/integration/sync_errors_test.cc
est/integration/sync_exponential_backoff_test.cc
est/integration/sync_extension_helper.cc
est/integration/sync_test.cc
est/integration/two_client_bookmarks_sync_test.cc
est/integration/two_client_preferences_sync_test.cc
est_profile_sync_service.cc
46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd 09-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 275586

This commit was generated by merge_to_master.py.

Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
lue/bookmark_change_processor.cc
lue/bookmark_model_associator.cc
lue/favicon_cache.cc
lue/non_ui_data_type_controller.cc
lue/non_ui_data_type_controller.h
lue/shared_change_processor.cc
lue/shared_change_processor.h
lue/shared_change_processor_ref.cc
lue/shared_change_processor_ref.h
lue/shared_change_processor_unittest.cc
lue/sync_backend_host_impl.cc
lue/sync_backend_host_impl_unittest.cc
lue/synced_device_tracker.cc
lue/typed_url_change_processor.cc
lue/typed_url_model_associator.cc
lue/typed_url_model_associator.h
lue/ui_data_type_controller.cc
lue/ui_data_type_controller.h
rofile_sync_components_factory_impl.cc
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
est/integration/enable_disable_test.cc
est/integration/fake_server_invalidation_service.h
est/integration/multiple_client_bookmarks_sync_test.cc
est/integration/multiple_client_preferences_sync_test.cc
est/integration/multiple_client_typed_urls_sync_test.cc
est/integration/single_client_bookmarks_sync_test.cc
est/integration/sync_auth_test.cc
est/integration/sync_errors_test.cc
est/integration/sync_test.cc
est/integration/sync_test.h
est/integration/two_client_app_list_sync_test.cc
est/integration/two_client_dictionary_sync_test.cc
est/integration/two_client_preferences_sync_test.cc
cedac228d2dd51db4b79ea1e72c7f249408ee061 03-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
WNERS
ackup_rollback_controller.cc
ackup_rollback_controller.h
ackup_rollback_controller_unittest.cc
lue/bookmark_change_processor.cc
lue/bookmark_change_processor.h
lue/bookmark_data_type_controller.cc
lue/bookmark_data_type_controller.h
lue/bookmark_data_type_controller_unittest.cc
lue/bookmark_model_associator.cc
lue/data_type_manager_impl.cc
lue/data_type_manager_impl.h
lue/data_type_manager_impl_unittest.cc
lue/search_engine_data_type_controller_unittest.cc
lue/shared_change_processor.cc
lue/sync_backend_host_core.cc
lue/sync_backend_host_core.h
lue/sync_backend_host_impl.cc
lue/sync_backend_host_impl.h
lue/sync_backend_host_impl_unittest.cc
lue/ui_data_type_controller.cc
lue/ui_data_type_controller_unittest.cc
anaged_user_signin_manager_wrapper.cc
anaged_user_signin_manager_wrapper.h
rofile_sync_components_factory.h
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl.h
rofile_sync_components_factory_mock.cc
rofile_sync_components_factory_mock.h
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
essions/sessions_sync_manager.cc
tartup_controller.cc
ync_error_notifier_ash.cc
ync_error_notifier_ash_unittest.cc
ync_ui_util.cc
ync_ui_util_unittest.cc
est/integration/autofill_helper.cc
est/integration/autofill_helper.h
est/integration/bookmarks_helper.cc
est/integration/bookmarks_helper.h
est/integration/fake_server_invalidation_service.cc
est/integration/fake_server_invalidation_service.h
est/integration/multi_client_status_change_checker.cc
est/integration/multi_client_status_change_checker.h
est/integration/p2p_invalidation_forwarder.cc
est/integration/profile_sync_service_harness.cc
est/integration/quiesce_status_change_checker.cc
est/integration/quiesce_status_change_checker.h
est/integration/single_client_bookmarks_sync_test.cc
est/integration/single_client_themes_sync_test.cc
est/integration/status_change_checker.cc
est/integration/status_change_checker.h
est/integration/sync_extension_helper.cc
est/integration/sync_test.cc
est/integration/themes_helper.cc
est/integration/themes_helper.h
est/integration/two_client_apps_sync_test.cc
est/integration/two_client_autofill_sync_test.cc
est/integration/two_client_themes_sync_test.cc
est_profile_sync_service.cc
est_profile_sync_service.h
0de6073388f4e2780db8536178b129cd8f6ab386 15-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269467

This commit was generated by merge_to_master.py.

Change-Id: Id6c03d44b5ad8b098017a943eb9ec8d804dfed99
EPS
lue/sync_backend_host_impl.cc
est/integration/fake_server_invalidation_service.h
010d83a9304c5a91596085d917d248abff47903a 14-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
lue/bookmark_change_processor.cc
lue/bookmark_change_processor.h
lue/bookmark_data_type_controller_unittest.cc
lue/data_type_manager_impl.cc
lue/data_type_manager_impl_unittest.cc
lue/frontend_data_type_controller.cc
lue/frontend_data_type_controller.h
lue/frontend_data_type_controller_unittest.cc
lue/non_frontend_data_type_controller.cc
lue/non_frontend_data_type_controller.h
lue/non_frontend_data_type_controller_unittest.cc
lue/non_ui_data_type_controller.cc
lue/non_ui_data_type_controller.h
lue/non_ui_data_type_controller_unittest.cc
lue/search_engine_data_type_controller_unittest.cc
lue/shared_change_processor.cc
lue/shared_change_processor.h
lue/shared_change_processor_unittest.cc
lue/sync_backend_host.h
lue/sync_backend_host_core.cc
lue/sync_backend_host_core.h
lue/sync_backend_host_impl.cc
lue/sync_backend_host_impl.h
lue/sync_backend_host_impl_unittest.cc
lue/sync_backend_host_mock.cc
lue/sync_backend_host_mock.h
lue/sync_backend_registrar.cc
lue/ui_data_type_controller.cc
lue/ui_data_type_controller.h
lue/ui_data_type_controller_unittest.cc
anaged_user_signin_manager_wrapper.cc
rofile_sync_components_factory.h
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl.h
rofile_sync_components_factory_mock.cc
rofile_sync_components_factory_mock.h
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_mock.h
est/integration/bookmarks_helper.cc
est/integration/fake_server_invalidation_service.cc
est/integration/fake_server_invalidation_service.h
est/integration/multiple_client_passwords_sync_test.cc
est/integration/passwords_helper.cc
est/integration/passwords_helper.h
est/integration/single_client_bookmarks_sync_test.cc
est/integration/sync_test.cc
est/integration/sync_test.h
est/integration/two_client_bookmarks_sync_test.cc
est/integration/two_client_passwords_sync_test.cc
5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 01-May-2014 Bo Liu <boliu@google.com> Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
bout_sync_util.cc
lue/autofill_data_type_controller_unittest.cc
lue/autofill_profile_data_type_controller.cc
lue/bookmark_change_processor.cc
lue/bookmark_change_processor.h
lue/bookmark_data_type_controller.cc
lue/bookmark_data_type_controller.h
lue/bookmark_data_type_controller_unittest.cc
lue/bookmark_model_associator.cc
lue/non_ui_data_type_controller.cc
lue/non_ui_data_type_controller.h
lue/non_ui_data_type_controller_unittest.cc
lue/search_engine_data_type_controller_unittest.cc
lue/shared_change_processor_mock.cc
lue/shared_change_processor_mock.h
lue/sync_backend_host_impl.cc
lue/ui_data_type_controller.cc
lue/ui_data_type_controller_unittest.cc
rofile_sync_auth_provider.cc
rofile_sync_auth_provider.h
rofile_sync_auth_provider_unittest.cc
rofile_sync_components_factory.h
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl.h
rofile_sync_components_factory_mock.h
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_preference_unittest.cc
est/integration/bookmarks_helper.cc
est/integration/bookmarks_helper.h
est/integration/multiple_client_passwords_sync_test.cc
est/integration/passwords_helper.cc
est/integration/search_engines_helper.cc
est/integration/single_client_bookmarks_sync_test.cc
est/integration/sync_app_helper.cc
est/integration/sync_test.cc
est/integration/two_client_apps_sync_test.cc
0529e5d033099cbfc42635f6f6183833b09dff6e 24-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
WNERS
lue/bookmark_change_processor.cc
lue/bookmark_change_processor.h
lue/bookmark_data_type_controller_unittest.cc
lue/change_processor.cc
lue/change_processor.h
lue/change_processor_mock.cc
lue/change_processor_mock.h
lue/extension_data_type_controller.h
lue/extension_setting_data_type_controller.cc
lue/fake_generic_change_processor.cc
lue/fake_generic_change_processor.h
lue/favicon_cache.cc
lue/favicon_cache.h
lue/favicon_cache_unittest.cc
lue/frontend_data_type_controller.cc
lue/frontend_data_type_controller_unittest.cc
lue/generic_change_processor.cc
lue/generic_change_processor.h
lue/generic_change_processor_unittest.cc
lue/non_frontend_data_type_controller.cc
lue/non_frontend_data_type_controller_unittest.cc
lue/search_engine_data_type_controller.h
lue/search_engine_data_type_controller_unittest.cc
lue/session_change_processor.cc
lue/session_change_processor.h
lue/session_data_type_controller.cc
lue/session_data_type_controller.h
lue/session_model_associator.cc
lue/session_model_associator.h
lue/session_model_associator_unittest.cc
lue/shared_change_processor.cc
lue/sync_backend_registrar.cc
lue/sync_backend_registrar_unittest.cc
lue/synced_device_tracker.cc
lue/synced_device_tracker.h
lue/synced_device_tracker_unittest.cc
lue/synced_session_tracker.h
lue/tab_node_pool.cc
lue/tab_node_pool.h
lue/tab_node_pool_unittest.cc
lue/typed_url_change_processor.cc
lue/typed_url_change_processor.h
lue/typed_url_model_associator.cc
lue/ui_data_type_controller_unittest.cc
rofile_sync_components_factory.h
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl.h
rofile_sync_components_factory_impl_unittest.cc
rofile_sync_components_factory_mock.cc
rofile_sync_components_factory_mock.h
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_android.h
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_mock.h
rofile_sync_service_preference_unittest.cc
rofile_sync_service_session_unittest.cc
essions/notification_service_sessions_router.cc
essions/notification_service_sessions_router.h
essions/session_data_type_controller.cc
essions/session_data_type_controller.h
essions/sessions_sync_manager.cc
essions/sessions_sync_manager.h
essions/sessions_sync_manager_unittest.cc
essions/sessions_util.cc
essions/sessions_util.h
essions/synced_window_delegates_getter.cc
essions/synced_window_delegates_getter.h
essions/tab_node_pool.cc
essions/tab_node_pool.h
essions/tab_node_pool_unittest.cc
essions2/notification_service_sessions_router.cc
essions2/notification_service_sessions_router.h
essions2/session_data_type_controller2.cc
essions2/session_data_type_controller2.h
essions2/sessions_sync_manager.cc
essions2/sessions_sync_manager.h
essions2/sessions_sync_manager_unittest.cc
essions2/sessions_util.cc
essions2/sessions_util.h
essions2/synced_window_delegates_getter.cc
essions2/synced_window_delegates_getter.h
essions2/tab_node_pool2.cc
essions2/tab_node_pool2.h
essions2/tab_node_pool2_unittest.cc
tartup_controller.cc
tartup_controller.h
tartup_controller_unittest.cc
ync_error_notifier_ash.cc
est/integration/bookmarks_helper.cc
est/integration/multiple_client_passwords_sync_test.cc
est/integration/sessions_helper.cc
est/integration/single_client_bookmarks_sync_test.cc
est/integration/sync_test.cc
est/integration/sync_test.h
a02191e04bc25c4935f804f2c080ae28663d096d 16-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 263965

This commit was generated by merge_to_master.py.

Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
RESUBMIT.py
bout_sync_util.cc
lue/fake_generic_change_processor.cc
lue/fake_generic_change_processor.h
lue/favicon_cache_unittest.cc
lue/generic_change_processor.cc
lue/generic_change_processor.h
lue/non_ui_data_type_controller.cc
lue/shared_change_processor.cc
lue/shared_change_processor.h
lue/shared_change_processor_mock.h
lue/sync_backend_host.h
lue/sync_backend_host_core.cc
lue/sync_backend_host_core.h
lue/sync_backend_host_impl.cc
lue/sync_backend_host_impl.h
lue/sync_backend_host_mock.cc
lue/sync_backend_host_mock.h
lue/ui_data_type_controller.cc
rofile_sync_service.cc
essions2/sessions_sync_manager_unittest.cc
est/integration/bookmarks_helper.cc
est/integration/bookmarks_helper.h
est/integration/multiple_client_bookmarks_sync_test.cc
est/integration/multiple_client_passwords_sync_test.cc
est/integration/multiple_client_preferences_sync_test.cc
est/integration/multiple_client_sessions_sync_test.cc
est/integration/multiple_client_typed_urls_sync_test.cc
est/integration/passwords_helper.cc
est/integration/passwords_helper.h
est/integration/performance/typed_urls_sync_perf_test.cc
est/integration/preferences_helper.cc
est/integration/preferences_helper.h
est/integration/sessions_helper.cc
est/integration/sessions_helper.h
est/integration/single_client_typed_urls_sync_test.cc
est/integration/sync_test.cc
est/integration/two_client_dictionary_sync_test.cc
est/integration/two_client_typed_urls_sync_test.cc
est/integration/typed_urls_helper.cc
est/integration/typed_urls_helper.h
est_profile_sync_service.cc
c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c 10-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
lue/generic_change_processor.cc
lue/generic_change_processor.h
lue/password_data_type_controller.h
lue/password_model_worker.cc
lue/password_model_worker.h
lue/shared_change_processor.cc
lue/shared_change_processor.h
lue/shared_change_processor_ref.cc
lue/shared_change_processor_ref.h
lue/sync_backend_host.h
lue/sync_backend_host_core.cc
lue/sync_backend_host_core.h
lue/sync_backend_host_impl.cc
lue/sync_backend_host_impl.h
lue/sync_backend_host_impl_unittest.cc
lue/sync_backend_host_mock.cc
lue/sync_backend_host_mock.h
lue/sync_backend_registrar.cc
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl_unittest.cc
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_preference_unittest.cc
rofile_sync_service_session_unittest.cc
rofile_sync_service_typed_url_unittest.cc
ync_error_notifier_ash.cc
est/integration/dictionary_helper.cc
est/integration/dictionary_helper.h
est/integration/multiple_client_dictionary_sync_test.cc
est/integration/passwords_helper.cc
est/integration/passwords_helper.h
est/integration/single_client_app_list_sync_test.cc
est/integration/sync_app_list_helper.cc
est/integration/sync_test.cc
est/integration/sync_test.h
est/integration/two_client_app_list_sync_test.cc
est/integration/two_client_apps_sync_test.cc
est/integration/two_client_bookmarks_sync_test.cc
est/integration/two_client_extensions_sync_test.cc
est/integration/two_client_passwords_sync_test.cc
est/integration/two_client_preferences_sync_test.cc
est/integration/two_client_themes_sync_test.cc
est_profile_sync_service.h
e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d 03-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
bout_sync_util.cc
lue/fake_generic_change_processor.cc
lue/favicon_cache_unittest.cc
lue/generic_change_processor.cc
lue/generic_change_processor.h
lue/generic_change_processor_unittest.cc
lue/sync_backend_host.h
lue/sync_backend_host_core.cc
lue/sync_backend_host_core.h
lue/sync_backend_host_impl.cc
lue/sync_backend_host_impl.h
lue/sync_backend_host_mock.cc
lue/sync_backend_host_mock.h
rofile_sync_components_factory_impl.cc
rofile_sync_service.cc
rofile_sync_service_android.cc
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_factory.cc
rofile_sync_service_mock.cc
rofile_sync_service_preference_unittest.cc
rofile_sync_service_session_unittest.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
essions2/sessions_sync_manager.cc
essions2/sessions_sync_manager_unittest.cc
ync_ui_util_unittest.cc
est/integration/cross_platform_sync_test.cc
est/integration/enable_disable_test.cc
est/integration/migration_test.cc
est/integration/multi_client_status_change_checker.cc
est/integration/multi_client_status_change_checker.h
est/integration/profile_sync_service_harness.cc
est/integration/quiesce_status_change_checker.cc
est/integration/quiesce_status_change_checker.h
est/integration/single_client_app_list_sync_test.cc
est/integration/single_client_apps_sync_test.cc
est/integration/single_client_bookmarks_sync_test.cc
est/integration/single_client_dictionary_sync_test.cc
est/integration/single_client_extensions_sync_test.cc
est/integration/single_client_passwords_sync_test.cc
est/integration/single_client_preferences_sync_test.cc
est/integration/single_client_search_engines_sync_test.cc
est/integration/single_client_sessions_sync_test.cc
est/integration/single_client_status_change_checker.cc
est/integration/single_client_status_change_checker.h
est/integration/single_client_themes_sync_test.cc
est/integration/single_client_typed_urls_sync_test.cc
est/integration/sync_auth_test.cc
est/integration/sync_errors_test.cc
est/integration/sync_exponential_backoff_test.cc
est/integration/sync_integration_test_util.cc
est/integration/sync_test.cc
est/integration/sync_test.h
est/integration/two_client_app_list_sync_test.cc
est/integration/two_client_apps_sync_test.cc
est/integration/two_client_autofill_sync_test.cc
est/integration/two_client_bookmarks_sync_test.cc
est/integration/two_client_dictionary_sync_test.cc
est/integration/two_client_extensions_sync_test.cc
est/integration/two_client_passwords_sync_test.cc
est/integration/two_client_preferences_sync_test.cc
est/integration/two_client_search_engines_sync_test.cc
est/integration/two_client_themes_sync_test.cc
est/integration/two_client_typed_urls_sync_test.cc
est_profile_sync_service.cc
effb81e5f8246d0db0270817048dc992db66e9fb 31-Mar-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
lue/sync_backend_host.h
lue/sync_backend_host_core.cc
lue/sync_backend_host_core.h
lue/sync_backend_host_impl.cc
lue/sync_backend_host_impl.h
lue/sync_backend_host_impl_unittest.cc
lue/sync_backend_host_mock.cc
lue/sync_backend_host_mock.h
anaged_user_signin_manager_wrapper.cc
anaged_user_signin_manager_wrapper.h
rofile_sync_components_factory_impl_unittest.cc
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_factory.cc
rofile_sync_service_mock.cc
rofile_sync_service_preference_unittest.cc
rofile_sync_service_session_unittest.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
rotocol_event_observer.cc
rotocol_event_observer.h
essions2/sessions_sync_manager.cc
essions2/sessions_sync_manager_unittest.cc
tartup_controller.cc
tartup_controller_unittest.cc
ync_error_controller.cc
ync_error_controller.h
ync_error_notifier_ash.cc
ync_error_notifier_ash.h
ync_error_notifier_ash_unittest.cc
ync_error_notifier_factory_ash.cc
ync_error_notifier_factory_ash.h
ync_global_error.cc
ync_global_error.h
ync_global_error_factory.cc
ync_global_error_factory.h
ync_global_error_unittest.cc
ync_ui_util.cc
ync_ui_util.h
ync_ui_util_unittest.cc
est/integration/cross_platform_sync_test.cc
est/integration/enable_disable_test.cc
est/integration/migration_test.cc
est/integration/p2p_invalidation_forwarder.h
est/integration/performance/sync_timing_helper.cc
est/integration/profile_sync_service_harness.cc
est/integration/profile_sync_service_harness.h
est/integration/quiesce_status_change_checker.cc
est/integration/quiesce_status_change_checker.h
est/integration/single_client_app_list_sync_test.cc
est/integration/single_client_apps_sync_test.cc
est/integration/single_client_bookmarks_sync_test.cc
est/integration/single_client_dictionary_sync_test.cc
est/integration/single_client_extensions_sync_test.cc
est/integration/single_client_passwords_sync_test.cc
est/integration/single_client_preferences_sync_test.cc
est/integration/single_client_search_engines_sync_test.cc
est/integration/single_client_sessions_sync_test.cc
est/integration/single_client_status_change_checker.cc
est/integration/single_client_status_change_checker.h
est/integration/single_client_themes_sync_test.cc
est/integration/single_client_typed_urls_sync_test.cc
est/integration/status_change_checker.h
est/integration/sync_auth_test.cc
est/integration/sync_errors_test.cc
est/integration/sync_exponential_backoff_test.cc
est/integration/sync_integration_test_util.cc
est/integration/sync_integration_test_util.h
est/integration/sync_test.cc
est/integration/sync_test.h
est/integration/two_client_app_list_sync_test.cc
est/integration/two_client_apps_sync_test.cc
est/integration/two_client_autofill_sync_test.cc
est/integration/two_client_bookmarks_sync_test.cc
est/integration/two_client_dictionary_sync_test.cc
est/integration/two_client_extensions_sync_test.cc
est/integration/two_client_passwords_sync_test.cc
est/integration/two_client_preferences_sync_test.cc
est/integration/two_client_search_engines_sync_test.cc
est/integration/two_client_themes_sync_test.cc
est/integration/two_client_typed_urls_sync_test.cc
est_profile_sync_service.cc
est_profile_sync_service.h
23730a6e56a168d1879203e4b3819bb36e3d8f1f 21-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: Id197cbdde2c2881915f096c0426c741416884783
WNERS
lue/session_model_associator.cc
lue/sync_backend_host_impl.cc
lue/sync_backend_host_impl.h
lue/sync_backend_host_impl_unittest.cc
lue/typed_url_data_type_controller.cc
lue/typed_url_data_type_controller.h
rofile_sync_components_factory.h
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl.h
rofile_sync_components_factory_impl_unittest.cc
rofile_sync_components_factory_mock.h
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_android.cc
rofile_sync_service_android.h
rofile_sync_service_factory.cc
rofile_sync_service_mock.cc
rofile_sync_service_session_unittest.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_unittest.cc
essions2/sessions_sync_manager.h
tartup_controller.cc
tartup_controller.h
tartup_controller_unittest.cc
ync_policy_handler.cc
ync_policy_handler_unittest.cc
ync_prefs.cc
ync_prefs.h
ync_prefs_unittest.cc
ync_ui_util.cc
ync_ui_util_unittest.cc
est/integration/profile_sync_service_harness.cc
est/integration/sync_app_helper.cc
est/integration/sync_auth_test.cc
est/integration/sync_extension_helper.cc
est/integration/sync_test.cc
est/integration/two_client_preferences_sync_test.cc
est_profile_sync_service.cc
est_profile_sync_service.h
a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 18-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
EPS
RESUBMIT.py
lue/autofill_data_type_controller_unittest.cc
lue/bookmark_data_type_controller_unittest.cc
lue/bookmark_model_associator.cc
lue/extension_setting_data_type_controller.h
lue/favicon_cache.cc
lue/favicon_cache.h
lue/favicon_cache_unittest.cc
lue/generic_change_processor.cc
lue/password_change_processor.cc
lue/password_change_processor.h
lue/password_data_type_controller.cc
lue/password_data_type_controller.h
lue/password_model_associator.cc
lue/password_model_associator.h
lue/sync_backend_host_impl.cc
lue/sync_backend_host_impl.h
lue/sync_backend_host_impl_unittest.cc
lue/synced_session_tracker.cc
rofile_sync_components_factory.h
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl.h
rofile_sync_components_factory_impl_unittest.cc
rofile_sync_components_factory_mock.h
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_factory.cc
rofile_sync_service_factory.h
rofile_sync_service_mock.cc
rofile_sync_service_mock.h
rofile_sync_service_password_unittest.cc
rofile_sync_service_preference_unittest.cc
rofile_sync_service_session_unittest.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
essions2/notification_service_sessions_router.cc
essions2/session_data_type_controller2.cc
essions2/session_data_type_controller2.h
tartup_controller.cc
tartup_controller.h
tartup_controller_unittest.cc
ync_global_error.cc
ync_global_error_unittest.cc
ync_prefs.cc
ync_startup_tracker.cc
ync_startup_tracker.h
ync_startup_tracker_unittest.cc
ync_ui_util.cc
ync_ui_util_unittest.cc
est/integration/extension_settings_helper.cc
est/integration/migration_test.cc
est/integration/p2p_invalidation_forwarder.cc
est/integration/p2p_invalidation_forwarder.h
est/integration/profile_sync_service_harness.cc
est/integration/profile_sync_service_harness.h
est/integration/prototype_fake_server_test.cc
est/integration/quiesce_status_change_checker.cc
est/integration/quiesce_status_change_checker.h
est/integration/search_engines_helper.cc
est/integration/single_client_app_list_sync_test.cc
est/integration/single_client_bookmarks_sync_test.cc
est/integration/single_client_status_change_checker.cc
est/integration/single_client_status_change_checker.h
est/integration/status_change_checker.cc
est/integration/status_change_checker.h
est/integration/sync_app_helper.cc
est/integration/sync_app_list_helper.cc
est/integration/sync_auth_test.cc
est/integration/sync_errors_test.cc
est/integration/sync_exponential_backoff_test.cc
est/integration/sync_extension_helper.cc
est/integration/sync_test.cc
est/integration/sync_test.h
est/integration/two_client_app_list_sync_test.cc
est/integration/two_client_apps_sync_test.cc
est/integration/two_client_preferences_sync_test.cc
est/integration/updated_progress_marker_checker.cc
est/integration/updated_progress_marker_checker.h
est_profile_sync_service.cc
est_profile_sync_service.h
5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 21-Feb-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
EPS
WNERS
bout_sync_util.cc
bout_sync_util_unittest.cc
ackend_migrator.h
ackend_migrator_unittest.cc
ackend_unrecoverable_error_handler.cc
ake_oauth2_token_service.cc
ake_oauth2_token_service.h
lue/autofill_data_type_controller.cc
lue/autofill_data_type_controller.h
lue/autofill_data_type_controller_unittest.cc
lue/autofill_profile_data_type_controller.cc
lue/backend_data_type_configurer.cc
lue/backend_data_type_configurer.h
lue/bookmark_change_processor.cc
lue/bookmark_change_processor.h
lue/bookmark_data_type_controller.cc
lue/bookmark_data_type_controller.h
lue/bookmark_data_type_controller_unittest.cc
lue/bookmark_model_associator.cc
lue/bookmark_model_associator.h
lue/change_processor.h
lue/chrome_encryptor.cc
lue/chrome_encryptor.h
lue/chrome_encryptor_unittest.cc
lue/chrome_report_unrecoverable_error.cc
lue/data_type_controller.cc
lue/data_type_controller.h
lue/data_type_controller_mock.cc
lue/data_type_controller_mock.h
lue/data_type_encryption_handler.cc
lue/data_type_encryption_handler.h
lue/data_type_error_handler.h
lue/data_type_error_handler_mock.cc
lue/data_type_error_handler_mock.h
lue/data_type_manager.cc
lue/data_type_manager.h
lue/data_type_manager_impl.cc
lue/data_type_manager_impl.h
lue/data_type_manager_impl_unittest.cc
lue/data_type_manager_mock.cc
lue/data_type_manager_mock.h
lue/data_type_manager_observer.h
lue/extension_data_type_controller.cc
lue/extension_setting_data_type_controller.cc
lue/extensions_activity_monitor_unittest.cc
lue/failed_data_types_handler.cc
lue/failed_data_types_handler.h
lue/fake_data_type_controller.cc
lue/fake_data_type_controller.h
lue/favicon_cache.cc
lue/favicon_cache.h
lue/frontend_data_type_controller.cc
lue/frontend_data_type_controller.h
lue/frontend_data_type_controller_unittest.cc
lue/generic_change_processor.cc
lue/generic_change_processor.h
lue/generic_change_processor_unittest.cc
lue/model_association_manager.cc
lue/model_association_manager.h
lue/model_association_manager_unittest.cc
lue/model_associator.h
lue/model_associator_mock.cc
lue/model_associator_mock.h
lue/non_frontend_data_type_controller.cc
lue/non_frontend_data_type_controller.h
lue/non_frontend_data_type_controller_unittest.cc
lue/non_ui_data_type_controller.cc
lue/non_ui_data_type_controller.h
lue/non_ui_data_type_controller_unittest.cc
lue/password_change_processor.cc
lue/password_change_processor.h
lue/password_data_type_controller.cc
lue/password_data_type_controller.h
lue/password_model_associator.cc
lue/password_model_associator.h
lue/password_model_worker.cc
lue/proxy_data_type_controller.cc
lue/proxy_data_type_controller.h
lue/search_engine_data_type_controller.cc
lue/search_engine_data_type_controller_unittest.cc
lue/session_change_processor.h
lue/session_data_type_controller.cc
lue/session_model_associator.cc
lue/session_model_associator.h
lue/session_sync_test_helper.cc
lue/shared_change_processor.h
lue/shared_change_processor_unittest.cc
lue/sync_backend_host.h
lue/sync_backend_host_core.cc
lue/sync_backend_host_core.h
lue/sync_backend_host_impl.cc
lue/sync_backend_host_impl.h
lue/sync_backend_host_impl_unittest.cc
lue/sync_backend_host_mock.cc
lue/sync_backend_registrar.cc
lue/sync_backend_registrar.h
lue/sync_backend_registrar_unittest.cc
lue/sync_frontend.cc
lue/sync_frontend.h
lue/synced_device_tracker.cc
lue/synced_session.cc
lue/synced_session.h
lue/synced_session_tracker.cc
lue/synced_session_tracker.h
lue/tab_node_pool.cc
lue/theme_data_type_controller.cc
lue/typed_url_change_processor.cc
lue/typed_url_change_processor.h
lue/typed_url_data_type_controller.cc
lue/typed_url_model_associator.cc
lue/typed_url_model_associator.h
lue/typed_url_model_associator_unittest.cc
lue/ui_data_type_controller.cc
lue/ui_data_type_controller.h
lue/ui_data_type_controller_unittest.cc
pen_tabs_ui_delegate.h
rofile_sync_components_factory.h
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl_unittest.cc
rofile_sync_components_factory_mock.cc
rofile_sync_components_factory_mock.h
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_android.cc
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_factory.cc
rofile_sync_service_harness.cc
rofile_sync_service_harness.h
rofile_sync_service_mock.cc
rofile_sync_service_mock.h
rofile_sync_service_password_unittest.cc
rofile_sync_service_preference_unittest.cc
rofile_sync_service_session_unittest.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
etry_verifier.cc
etry_verifier.h
essions2/notification_service_sessions_router.cc
essions2/session_data_type_controller2.cc
essions2/sessions_sync_manager.cc
essions2/sessions_sync_manager.h
essions2/sessions_sync_manager_unittest.cc
essions2/sessions_util.cc
essions2/sessions_util.h
essions2/synced_window_delegates_getter.cc
essions2/synced_window_delegates_getter.h
ync_global_error.cc
ync_global_error.h
ync_global_error_unittest.cc
ync_prefs.cc
ync_prefs_unittest.cc
ync_ui_util.cc
ync_ui_util_unittest.cc
est/integration/bookmarks_helper.cc
est/integration/cross_platform_sync_test.cc
est/integration/dictionary_helper.cc
est/integration/enable_disable_test.cc
est/integration/extension_settings_helper.cc
est/integration/migration_errors_test.cc
est/integration/migration_test.cc
est/integration/multiple_client_dictionary_sync_test.cc
est/integration/multiple_client_passwords_sync_test.cc
est/integration/multiple_client_preferences_sync_test.cc
est/integration/multiple_client_sessions_sync_test.cc
est/integration/multiple_client_typed_urls_sync_test.cc
est/integration/passwords_helper.cc
est/integration/performance/autofill_sync_perf_test.cc
est/integration/performance/bookmarks_sync_perf_test.cc
est/integration/performance/dictionary_sync_perf_test.cc
est/integration/performance/extensions_sync_perf_test.cc
est/integration/performance/passwords_sync_perf_test.cc
est/integration/performance/sessions_sync_perf_test.cc
est/integration/performance/sync_timing_helper.cc
est/integration/performance/typed_urls_sync_perf_test.cc
est/integration/preferences_helper.cc
est/integration/preferences_helper.h
est/integration/profile_sync_service_harness.cc
est/integration/profile_sync_service_harness.h
est/integration/prototype_fake_server_test.cc
est/integration/retry_verifier.cc
est/integration/retry_verifier.h
est/integration/search_engines_helper.cc
est/integration/sessions_helper.cc
est/integration/single_client_app_list_sync_test.cc
est/integration/single_client_apps_sync_test.cc
est/integration/single_client_bookmarks_sync_test.cc
est/integration/single_client_dictionary_sync_test.cc
est/integration/single_client_extensions_sync_test.cc
est/integration/single_client_managed_user_settings_sync_test.cc
est/integration/single_client_passwords_sync_test.cc
est/integration/single_client_preferences_sync_test.cc
est/integration/single_client_search_engines_sync_test.cc
est/integration/single_client_sessions_sync_test.cc
est/integration/single_client_themes_sync_test.cc
est/integration/single_client_typed_urls_sync_test.cc
est/integration/status_change_checker.cc
est/integration/status_change_checker.h
est/integration/sync_app_helper.cc
est/integration/sync_app_list_helper.cc
est/integration/sync_app_list_helper.h
est/integration/sync_auth_test.cc
est/integration/sync_errors_test.cc
est/integration/sync_exponential_backoff_test.cc
est/integration/sync_extension_helper.cc
est/integration/sync_test.cc
est/integration/sync_test.h
est/integration/two_client_app_list_sync_test.cc
est/integration/two_client_apps_sync_test.cc
est/integration/two_client_autofill_sync_test.cc
est/integration/two_client_bookmarks_sync_test.cc
est/integration/two_client_dictionary_sync_test.cc
est/integration/two_client_extension_settings_and_app_settings_sync_test.cc
est/integration/two_client_extensions_sync_test.cc
est/integration/two_client_passwords_sync_test.cc
est/integration/two_client_preferences_sync_test.cc
est/integration/two_client_search_engines_sync_test.cc
est/integration/two_client_sessions_sync_test.cc
est/integration/two_client_themes_sync_test.cc
est/integration/two_client_typed_urls_sync_test.cc
est/integration/typed_urls_helper.cc
est_profile_sync_service.cc
est_profile_sync_service.h
ser_selectable_sync_type.h
a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 18-Dec-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
bout_sync_util.cc
bout_sync_util_unittest.cc
lue/autofill_data_type_controller.cc
lue/autofill_data_type_controller_unittest.cc
lue/autofill_profile_data_type_controller.cc
lue/bookmark_change_processor.cc
lue/bookmark_change_processor.h
lue/bookmark_model_associator.cc
lue/extension_data_type_controller.cc
lue/extension_setting_data_type_controller.cc
lue/session_sync_test_helper.cc
lue/sync_backend_host.h
lue/sync_backend_host_core.cc
lue/sync_backend_host_impl.cc
lue/sync_backend_host_impl.h
lue/sync_backend_host_impl_unittest.cc
lue/sync_backend_host_mock.cc
lue/sync_backend_host_mock.h
lue/theme_data_type_controller.cc
lue/typed_url_model_associator.cc
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl_unittest.cc
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_android.cc
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_harness.cc
rofile_sync_service_mock.h
rofile_sync_service_password_unittest.cc
rofile_sync_service_preference_unittest.cc
rofile_sync_service_session_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
essions2/notification_service_sessions_router.cc
essions2/notification_service_sessions_router.h
essions2/sessions_sync_manager.cc
essions2/sessions_sync_manager.h
essions2/sessions_sync_manager_unittest.cc
ync_global_error.cc
ync_global_error.h
ync_policy_handler.h
ync_ui_util.cc
ync_ui_util.h
ync_ui_util_unittest.cc
est/integration/autofill_helper.cc
est/integration/autofill_helper.h
est/integration/bookmarks_helper.cc
est/integration/multiple_client_typed_urls_sync_test.cc
est/integration/search_engines_helper.cc
est/integration/search_engines_helper.h
est/integration/sync_app_helper.cc
est/integration/sync_extension_helper.cc
est/integration/sync_test.cc
est/integration/two_client_apps_sync_test.cc
est/integration/two_client_autofill_sync_test.cc
est/integration/two_client_typed_urls_sync_test.cc
est_profile_sync_service.cc
est_profile_sync_service.h
f2477e01787aa58f445919b809d89e252beef54f 28-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
bout_sync_util.cc
bout_sync_util.h
bstract_profile_sync_service_test.cc
bstract_profile_sync_service_test.h
ackend_migrator_unittest.cc
ake_oauth2_token_service.cc
ake_oauth2_token_service.h
lue/autofill_data_type_controller_unittest.cc
lue/bookmark_change_processor.cc
lue/bookmark_change_processor.h
lue/bookmark_data_type_controller_unittest.cc
lue/bookmark_model_associator.cc
lue/chrome_report_unrecoverable_error.cc
lue/device_info.cc
lue/extensions_activity_monitor.cc
lue/extensions_activity_monitor_unittest.cc
lue/favicon_cache.cc
lue/frontend_data_type_controller_unittest.cc
lue/non_frontend_data_type_controller_unittest.cc
lue/non_ui_data_type_controller_unittest.cc
lue/search_engine_data_type_controller_unittest.cc
lue/session_model_associator.h
lue/shared_change_processor_unittest.cc
lue/sync_backend_host.cc
lue/sync_backend_host.h
lue/sync_backend_host_core.cc
lue/sync_backend_host_core.h
lue/sync_backend_host_impl.cc
lue/sync_backend_host_impl.h
lue/sync_backend_host_impl_unittest.cc
lue/sync_backend_host_mock.cc
lue/sync_backend_host_mock.h
lue/sync_backend_host_unittest.cc
lue/sync_backend_registrar_unittest.cc
lue/sync_frontend.cc
lue/sync_frontend.h
lue/synced_tab_delegate_android.cc
lue/typed_url_model_associator_unittest.cc
lue/ui_data_type_controller_unittest.cc
pen_tabs_ui_delegate.cc
pen_tabs_ui_delegate.h
rofile_sync_components_factory.h
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl.h
rofile_sync_components_factory_mock.h
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_android.cc
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_harness.cc
rofile_sync_service_harness.h
rofile_sync_service_mock.cc
rofile_sync_service_mock.h
rofile_sync_service_password_unittest.cc
rofile_sync_service_preference_unittest.cc
rofile_sync_service_session_unittest.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
essions2/session_data_type_controller2.cc
essions2/session_data_type_controller2.h
essions2/sessions_sync_manager.cc
essions2/sessions_sync_manager.h
essions2/sessions_sync_manager_unittest.cc
ync_policy_handler.cc
ync_policy_handler_unittest.cc
ync_prefs.cc
ync_prefs.h
ync_prefs_unittest.cc
est/integration/apps_helper.cc
est/integration/apps_helper.h
est/integration/autofill_helper.cc
est/integration/extension_settings_helper.cc
est/integration/extensions_helper.cc
est/integration/extensions_helper.h
est/integration/performance/autofill_sync_perf_test.cc
est/integration/performance/extensions_sync_perf_test.cc
est/integration/performance/sessions_sync_perf_test.cc
est/integration/sessions_helper.cc
est/integration/single_client_managed_user_settings_sync_test.cc
est/integration/sync_app_helper.cc
est/integration/sync_auth_test.cc
est/integration/sync_errors_test.cc
est/integration/sync_extension_helper.cc
est/integration/sync_extension_helper.h
est/integration/sync_test.cc
est/integration/sync_test.h
est/integration/themes_helper.cc
est/integration/two_client_apps_sync_test.cc
est/integration/two_client_extensions_sync_test.cc
est/integration/two_client_themes_sync_test.cc
est_profile_sync_service.cc
est_profile_sync_service.h
0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 06-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232870

This commit was generated by merge_to_master.py.

Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
rofile_sync_service_autofill_unittest.cc
essions2/sessions_sync_manager.cc
essions2/sessions_sync_manager.h
essions2/sessions_sync_manager_unittest.cc
ync_global_error.h
est/integration/sync_test.cc
1e9bf3e0803691d0a228da41fc608347b6db4340 31-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232015

This commit was generated by merge_to_master.py.

Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
WNERS
lue/sync_backend_host.cc
lue/sync_backend_host.h
lue/sync_backend_host_unittest.cc
lue/sync_backend_registrar.cc
rofile_sync_components_factory_impl.cc
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_android.cc
rofile_sync_service_android.h
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_harness.cc
rofile_sync_service_password_unittest.cc
rofile_sync_service_preference_unittest.cc
rofile_sync_service_session_unittest.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
ync_policy_handler.cc
ync_policy_handler.h
ync_policy_handler_unittest.cc
est/integration/apps_helper.cc
est/integration/apps_helper.h
est/integration/extensions_helper.cc
est/integration/extensions_helper.h
est/integration/migration_errors_test.cc
est/integration/performance/extensions_sync_perf_test.cc
est/integration/preferences_helper.cc
est/integration/sync_extension_helper.cc
est/integration/sync_extension_helper.h
est/integration/two_client_apps_sync_test.cc
est/integration/two_client_extensions_sync_test.cc
est_profile_sync_service.cc
est_profile_sync_service.h
8bcbed890bc3ce4d7a057a8f32cab53fa534672e 22-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 230120

This commit was generated by merge_to_master.py.

Change-Id: I54bc06b7ee8a07092e74ce3b68c6893508349042
rofile_sync_service_android.cc
rofile_sync_service_preference_unittest.cc
est/integration/single_client_managed_user_settings_sync_test.cc
est/integration/sync_extension_helper.cc
4e180b6a0b4720a9b8e9e959a882386f690f08ff 18-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
ackend_migrator.cc
ackend_migrator.h
lue/autofill_data_type_controller_unittest.cc
lue/bookmark_change_processor.cc
lue/data_type_manager_impl.cc
lue/data_type_manager_impl.h
lue/favicon_cache.cc
lue/favicon_cache.h
lue/favicon_cache_unittest.cc
lue/model_association_manager.cc
lue/search_engine_data_type_controller.cc
lue/search_engine_data_type_controller.h
lue/search_engine_data_type_controller_unittest.cc
lue/session_change_processor.cc
lue/session_change_processor.h
lue/session_model_associator.cc
lue/session_model_associator.h
lue/session_sync_test_helper.cc
lue/session_sync_test_helper.h
lue/sync_backend_host.cc
lue/sync_backend_host.h
lue/sync_backend_host_unittest.cc
lue/synced_device_tracker.cc
lue/synced_device_tracker.h
lue/synced_session.cc
lue/synced_window_delegate_android.cc
rofile_sync_components_factory_impl.cc
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_android.cc
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_harness.cc
rofile_sync_service_session_unittest.cc
essions2/sessions_sync_manager.cc
essions2/sessions_sync_manager.h
essions2/sessions_sync_manager_unittest.cc
essions2/tab_node_pool2.cc
essions2/tab_node_pool2.h
essions2/tab_node_pool2_unittest.cc
ync_prefs.cc
ync_ui_util_unittest.cc
est/integration/sync_test.cc
est_profile_sync_service.cc
est_profile_sync_service.h
ser_selectable_sync_type.h
68043e1e95eeb07d5cae7aca370b26518b0867d6 26-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
lue/bookmark_model_associator.cc
lue/chrome_report_unrecoverable_error.cc
lue/data_type_manager_impl.cc
lue/data_type_manager_impl.h
lue/device_info.cc
lue/device_info.h
lue/password_change_processor.cc
lue/password_change_processor.h
lue/password_model_associator.cc
lue/password_model_associator.h
lue/synced_session.h
rofile_sync_components_factory_impl_unittest.cc
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_factory.cc
rofile_sync_service_mock.cc
rofile_sync_service_password_unittest.cc
rofile_sync_service_preference_unittest.cc
rofile_sync_service_session_unittest.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
essions2/tab_node_pool2.cc
est/integration/bookmarks_helper.cc
est/integration/single_client_bookmarks_sync_test.cc
est/integration/two_client_bookmarks_sync_test.cc
est_profile_sync_service.cc
est_profile_sync_service.h
d0247b1b59f9c528cb6df88b4f2b9afaf80d181e 19-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 224184

This commit was generated by merge_to_master.py.

Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
bout_sync_util.cc
lue/bookmark_change_processor.cc
lue/device_info.cc
lue/generic_change_processor.cc
lue/password_model_worker.cc
lue/password_model_worker.h
lue/sync_backend_host.cc
lue/sync_backend_host.h
lue/typed_url_change_processor.cc
rofile_sync_components_factory_impl.cc
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_android.cc
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_bookmark_unittest.cc
est/integration/dictionary_helper.cc
est/integration/sync_test.cc
est/test_http_bridge_factory.cc
est/test_http_bridge_factory.h
est_profile_sync_service.cc
58537e28ecd584eab876aee8be7156509866d23a 12-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 222756

This commit was generated by merge_to_master.py.

Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
lue/bookmark_data_type_controller_unittest.cc
lue/extension_data_type_controller.cc
lue/extension_setting_data_type_controller.cc
lue/fake_generic_change_processor.cc
lue/fake_generic_change_processor.h
lue/favicon_cache_unittest.cc
lue/generic_change_processor.cc
lue/generic_change_processor.h
lue/generic_change_processor_unittest.cc
lue/model_association_manager.cc
lue/non_ui_data_type_controller.cc
lue/non_ui_data_type_controller_unittest.cc
lue/password_change_processor.cc
lue/password_model_associator.cc
lue/password_model_associator.h
lue/session_change_processor.cc
lue/session_model_associator.cc
lue/shared_change_processor.cc
lue/shared_change_processor.h
lue/shared_change_processor_mock.h
lue/shared_change_processor_ref.cc
lue/shared_change_processor_ref.h
lue/theme_data_type_controller.cc
lue/ui_data_type_controller.cc
rofile_sync_components_factory_impl.cc
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_android.cc
rofile_sync_service_android.h
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_mock.cc
rofile_sync_service_mock.h
rofile_sync_service_password_unittest.cc
rofile_sync_service_unittest.cc
est/integration/bookmarks_helper.cc
est/integration/extension_settings_helper.cc
est/integration/multiple_client_passwords_sync_test.cc
est/integration/passwords_helper.cc
est/integration/passwords_helper.h
est/integration/performance/passwords_sync_perf_test.cc
est/integration/single_client_managed_user_settings_sync_test.cc
est/integration/single_client_passwords_sync_test.cc
est/integration/sync_app_helper.cc
est/integration/sync_extension_helper.cc
est/integration/sync_test.cc
est/integration/two_client_passwords_sync_test.cc
est/test_http_bridge_factory.cc
est/test_http_bridge_factory.h
est_profile_sync_service.cc
424c4d7b64af9d0d8fd9624f381f469654d5e3d2 30-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r220549

This commit was generated by merge_to_master.py.

Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
lue/session_model_associator.cc
lue/session_model_associator_unittest.cc
lue/sync_backend_host.cc
lue/synced_device_tracker.cc
lue/synced_device_tracker.h
lue/synced_tab_delegate.h
lue/synced_tab_delegate_android.cc
lue/synced_tab_delegate_android.h
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_android.cc
rofile_sync_service_startup_unittest.cc
est/integration/single_client_sessions_sync_test.cc
est_profile_sync_service.h
3551c9c881056c480085172ff9840cab31610854 23-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r219274

This commit was generated by merge_to_master.py.

Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
lue/device_info.cc
lue/extensions_activity_monitor_unittest.cc
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_mock.cc
rofile_sync_service_mock.h
rofile_sync_service_password_unittest.cc
rofile_sync_service_preference_unittest.cc
rofile_sync_service_session_unittest.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
essions2/tab_node_pool2.cc
essions2/tab_node_pool2.h
essions2/tab_node_pool2_unittest.cc
est/integration/apps_helper.cc
est/integration/extensions_helper.cc
est/integration/sync_extension_helper.cc
est/integration/sync_extension_helper.h
est/integration/themes_helper.cc
ba5b9a6411cb1792fd21f0a078d7a25cd1ceec16 12-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216972

This commit was generated by merge_to_master.py.

Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd
lue/session_model_associator.cc
lue/session_model_associator.h
lue/synced_session_tracker.cc
lue/tab_node_pool.cc
lue/tab_node_pool.h
lue/tab_node_pool_unittest.cc
rofile_sync_service_session_unittest.cc
bb1529ce867d8845a77ec7cdf3e3003ef1771a40 08-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216370

This commit was generated by merge_to_master.py.

Change-Id: I739228187a6f1df6c28c5761160e593a49891113
rofile_sync_service.cc
est/integration/autofill_helper.cc
3240926e260ce088908e02ac07a6cf7b0c0cbf44 07-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216133

This commit was generated by merge_to_master.py.

Change-Id: I541d5d1d8520b6b3829fbc1fa18552bf9ad4a5c7
lue/session_change_processor.cc
lue/session_change_processor.h
lue/session_model_associator.cc
lue/synced_session.cc
rofile_sync_service_autofill_unittest.cc
est/integration/autofill_helper.cc
est/integration/performance/autofill_sync_perf_test.cc
2385ea399aae016c0806a4f9ef3c9cfe3d2a39df 06-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r215849

This commit was generated by merge_to_master.py.

Change-Id: I225a31651af894e33bdd71e7121702bcbe5310f4
lue/session_model_associator.cc
lue/sync_backend_host.cc
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl_unittest.cc
a36e5920737c6adbddd3e43b760e5de8431db6e0 05-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r215573

This commit was generated by merge_to_master.py.

Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca
bout_sync_util.cc
lue/browser_thread_model_worker.cc
lue/chrome_extensions_activity_monitor.cc
lue/chrome_extensions_activity_monitor.h
lue/chrome_extensions_activity_monitor_unittest.cc
lue/device_info.cc
lue/device_info.h
lue/extensions_activity_monitor.cc
lue/extensions_activity_monitor.h
lue/extensions_activity_monitor_unittest.cc
lue/history_model_worker.cc
lue/history_model_worker.h
lue/non_frontend_data_type_controller.cc
lue/non_frontend_data_type_controller.h
lue/non_frontend_data_type_controller_mock.h
lue/non_frontend_data_type_controller_unittest.cc
lue/password_change_processor.cc
lue/password_change_processor.h
lue/password_data_type_controller.cc
lue/password_data_type_controller.h
lue/password_model_associator.cc
lue/password_model_associator.h
lue/password_model_worker.cc
lue/session_model_associator.cc
lue/session_model_associator.h
lue/session_model_associator_unittest.cc
lue/sync_backend_host.cc
lue/sync_backend_host.h
lue/sync_backend_host_unittest.cc
lue/sync_backend_registrar.cc
lue/sync_backend_registrar.h
lue/sync_backend_registrar_unittest.cc
lue/synced_session_tracker.cc
lue/synced_session_tracker.h
lue/synced_session_tracker_unittest.cc
lue/synced_tab_delegate.h
lue/synced_tab_delegate_android.cc
lue/synced_tab_delegate_android.h
lue/tab_node_pool.cc
lue/tab_node_pool.h
lue/tab_node_pool_unittest.cc
lue/typed_url_change_processor.cc
lue/typed_url_change_processor.h
lue/typed_url_data_type_controller.cc
lue/typed_url_data_type_controller.h
lue/typed_url_model_associator.cc
lue/typed_url_model_associator.h
lue/typed_url_model_associator_unittest.cc
lue/ui_model_worker.cc
lue/ui_model_worker.h
lue/ui_model_worker_unittest.cc
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl_unittest.cc
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_harness.cc
rofile_sync_service_mock.cc
rofile_sync_service_mock.h
rofile_sync_service_session_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
est/integration/enable_disable_test.cc
est/integration/sync_extension_helper.cc
est/integration/sync_test.cc
est_profile_sync_service.cc
est_profile_sync_service.h
558790d6acca3451cf3a6b497803a5f07d0bec58 30-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r214332

This commit was generated by merge_to_master.py.

Change-Id: I82a7c38de906244dc882493568013be659aa65d1
lue/session_model_associator.cc
lue/session_model_associator.h
ync_ui_util.cc
bbcdd45c55eb7c4641ab97aef9889b0fc828e7d3 25-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213605

This commit was generated by merge_to_master.py.

Change-Id: I5ef9e03bf077dac295a7904f06b3cb6dec9fe213
est/integration/sync_test.cc
est/integration/sync_test.h
a3f7b4e666c476898878fa745f637129375cd889 24-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213371

This commit was generated by merge_to_master.py.

Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf
bstract_profile_sync_service_test.cc
bstract_profile_sync_service_test.h
lue/autofill_data_type_controller_unittest.cc
lue/search_engine_data_type_controller_unittest.cc
lue/sync_backend_host_unittest.cc
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_password_unittest.cc
rofile_sync_service_preference_unittest.cc
rofile_sync_service_session_unittest.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
est/integration/two_client_sessions_sync_test.cc
ca12bfac764ba476d6cd062bf1dde12cc64c3f40 23-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213057

This commit was generated by merge_to_master.py.

Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388
lue/android_invalidator_bridge_proxy_unittest.cc
lue/android_invalidator_bridge_unittest.cc
lue/data_type_manager_impl.cc
lue/data_type_manager_impl_unittest.cc
lue/device_info.cc
lue/device_info.h
lue/session_change_processor.cc
lue/session_model_associator.cc
lue/session_model_associator.h
lue/sync_backend_host.cc
lue/sync_backend_host.h
lue/tab_node_pool.cc
lue/tab_node_pool.h
lue/tab_node_pool_unittest.cc
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_android.cc
rofile_sync_service_mock.h
rofile_sync_service_session_unittest.cc
est/integration/sync_test.cc
est_profile_sync_service.cc
est_profile_sync_service.h
9ab5563a3196760eb381d102cbb2bc0f7abc6a50 18-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212225

This commit was generated by merge_to_master.py.

Change-Id: I9b658b6bade7aff6166611a04fb26f4bcf0ca77c
bstract_profile_sync_service_test.h
ackend_migrator.cc
ackend_migrator_unittest.cc
lue/android_invalidator_bridge_unittest.cc
lue/autofill_data_type_controller_unittest.cc
lue/bookmark_data_type_controller_unittest.cc
lue/bookmark_model_associator.cc
lue/browser_thread_model_worker_unittest.cc
lue/chrome_extensions_activity_monitor_unittest.cc
lue/data_type_manager_impl.cc
lue/data_type_manager_impl_unittest.cc
lue/favicon_cache.cc
lue/favicon_cache_unittest.cc
lue/frontend_data_type_controller_unittest.cc
lue/generic_change_processor_unittest.cc
lue/history_model_worker.cc
lue/model_association_manager.cc
lue/model_association_manager_unittest.cc
lue/non_frontend_data_type_controller_unittest.cc
lue/non_ui_data_type_controller_unittest.cc
lue/session_model_associator_unittest.cc
lue/shared_change_processor_unittest.cc
lue/sync_backend_host_unittest.cc
lue/sync_backend_registrar.cc
lue/synced_device_tracker_unittest.cc
lue/ui_data_type_controller_unittest.cc
lue/ui_model_worker.cc
lue/ui_model_worker_unittest.cc
rofile_sync_components_factory_impl_unittest.cc
rofile_sync_service.cc
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_harness.cc
rofile_sync_service_session_unittest.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_unittest.cc
rofile_sync_test_util.h
ync_prefs_unittest.cc
est/integration/sync_test.cc
7dbb3d5cf0c15f500944d211057644d6a2f37371 17-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212014

This commit was generated by merge_to_master.py.

Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
bout_sync_util_unittest.cc
ackend_migrator.cc
ackend_migrator_unittest.cc
lue/android_invalidator_bridge_unittest.cc
lue/autofill_data_type_controller_unittest.cc
lue/bookmark_change_processor.cc
lue/bookmark_change_processor.h
lue/bookmark_data_type_controller.cc
lue/bookmark_data_type_controller_unittest.cc
lue/bookmark_model_associator.cc
lue/chrome_extensions_activity_monitor.cc
lue/chrome_extensions_activity_monitor_unittest.cc
lue/data_type_manager_impl_unittest.cc
lue/data_type_manager_mock.cc
lue/device_info.cc
lue/device_info.h
lue/favicon_cache.cc
lue/favicon_cache.h
lue/favicon_cache_unittest.cc
lue/generic_change_processor.cc
lue/generic_change_processor_unittest.cc
lue/non_frontend_data_type_controller.cc
lue/password_change_processor.cc
lue/search_engine_data_type_controller.cc
lue/search_engine_data_type_controller_unittest.cc
lue/session_change_processor.cc
lue/session_data_type_controller.cc
lue/session_model_associator.cc
lue/session_model_associator.h
lue/session_model_associator_unittest.cc
lue/sync_backend_host.cc
lue/sync_backend_host.h
lue/sync_backend_host_unittest.cc
lue/synced_device_tracker.cc
lue/synced_device_tracker_unittest.cc
lue/synced_tab_delegate.h
lue/synced_tab_delegate_android.cc
lue/synced_tab_delegate_android.h
lue/tab_node_pool.cc
lue/tab_node_pool.h
lue/tab_node_pool_unittest.cc
lue/typed_url_change_processor.cc
lue/typed_url_data_type_controller.cc
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl_unittest.cc
rofile_sync_service.cc
rofile_sync_service_android.cc
rofile_sync_service_android.h
rofile_sync_service_factory.cc
rofile_sync_service_harness.cc
rofile_sync_service_password_unittest.cc
rofile_sync_service_session_unittest.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
ync_prefs.cc
ync_prefs.h
ync_prefs_unittest.cc
ync_startup_tracker_unittest.cc
ync_ui_util.cc
ync_ui_util_unittest.cc
est/integration/autofill_helper.cc
est/integration/enable_disable_test.cc
est/integration/sync_extension_helper.cc
est/integration/sync_test.cc
est/integration/two_client_preferences_sync_test.cc
est_profile_sync_service.cc
eb525c5499e34cc9c4b825d6d9e75bb07cc06ace 10-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r210036

This commit was generated by merge_to_master.py.

Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
lue/android_invalidator_bridge.cc
lue/android_invalidator_bridge.h
lue/android_invalidator_bridge_proxy.cc
lue/android_invalidator_bridge_proxy.h
lue/autofill_data_type_controller.cc
lue/autofill_data_type_controller_unittest.cc
lue/autofill_profile_data_type_controller.cc
lue/autofill_profile_data_type_controller.h
lue/backend_data_type_configurer.h
lue/bookmark_data_type_controller_unittest.cc
lue/bookmark_model_associator.cc
lue/bookmark_model_associator.h
lue/browser_thread_model_worker_unittest.cc
lue/data_type_controller.cc
lue/data_type_manager_impl.cc
lue/data_type_manager_impl.h
lue/data_type_manager_impl_unittest.cc
lue/failed_data_types_handler.cc
lue/failed_data_types_handler.h
lue/fake_data_type_controller.cc
lue/favicon_cache.cc
lue/favicon_cache.h
lue/favicon_cache_unittest.cc
lue/frontend_data_type_controller.cc
lue/frontend_data_type_controller_unittest.cc
lue/generic_change_processor.cc
lue/generic_change_processor_unittest.cc
lue/model_association_manager.cc
lue/model_association_manager.h
lue/model_association_manager_unittest.cc
lue/non_frontend_data_type_controller.cc
lue/non_frontend_data_type_controller_unittest.cc
lue/non_ui_data_type_controller.cc
lue/non_ui_data_type_controller_unittest.cc
lue/password_model_associator.cc
lue/search_engine_data_type_controller_unittest.cc
lue/session_model_associator.h
lue/session_model_associator_unittest.cc
lue/shared_change_processor.cc
lue/sync_backend_host.cc
lue/sync_backend_host.h
lue/sync_backend_host_unittest.cc
lue/sync_backend_registrar.cc
lue/sync_backend_registrar.h
lue/sync_backend_registrar_unittest.cc
lue/synced_device_tracker.cc
lue/synced_device_tracker.h
lue/synced_device_tracker_unittest.cc
lue/synced_session.h
lue/typed_url_model_associator_unittest.cc
lue/ui_data_type_controller.cc
lue/ui_data_type_controller_unittest.cc
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl.h
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_android.cc
rofile_sync_service_android.h
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_factory.cc
rofile_sync_service_harness.cc
rofile_sync_service_harness.h
rofile_sync_service_observer.cc
rofile_sync_service_observer.h
rofile_sync_service_password_unittest.cc
rofile_sync_service_preference_unittest.cc
rofile_sync_service_session_unittest.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
esources/gaia_login.css
esources/gaia_login.html
esources/gaia_login.js
esources/gaia_login_test.html
esources/google_transparent.png
etry_verifier.h
ync_prefs.cc
ync_prefs.h
ync_prefs_unittest.cc
ync_ui_util.cc
est/integration/autofill_helper.cc
est/integration/bookmarks_helper.h
est/integration/passwords_helper.cc
est/integration/performance/autofill_sync_perf_test.cc
est/integration/performance/sync_timing_helper.cc
est/integration/search_engines_helper.cc
est/integration/sessions_helper.cc
est/integration/sync_test.cc
est/integration/two_client_autofill_sync_test.cc
est/integration/two_client_preferences_sync_test.cc
est/integration/typed_urls_helper.cc
est_profile_sync_service.cc
est_profile_sync_service.h
7d4cd473f85ac64c3747c96c277f9e506a0d2246 19-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r207203

This commit was generated by merge_to_master.py.

Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
bout_sync_util.cc
lue/autofill_data_type_controller.cc
lue/autofill_profile_data_type_controller.cc
lue/bookmark_change_processor.cc
lue/bookmark_change_processor.h
lue/bookmark_model_associator.cc
lue/bookmark_model_associator.h
lue/model_association_manager.cc
lue/shared_change_processor_unittest.cc
lue/sync_backend_host.cc
lue/sync_backend_host.h
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_android.cc
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_harness.cc
rofile_sync_service_mock.h
rofile_sync_service_model_type_selection_android.h
rofile_sync_service_password_unittest.cc
rofile_sync_service_preference_unittest.cc
rofile_sync_service_session_unittest.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
ync_startup_tracker.cc
ync_startup_tracker.h
ync_startup_tracker_unittest.cc
ync_ui_util.cc
est/integration/autofill_helper.cc
est/integration/passwords_helper.cc
est/integration/single_client_managed_user_settings_sync_test.cc
est/integration/sync_app_helper.cc
est/integration/sync_errors_test.cc
est_profile_sync_service.cc
est_profile_sync_service.h
868fa2fe829687343ffae624259930155e16dbd8 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
bout_sync_util.cc
bout_sync_util_unittest.cc
ackend_migrator_unittest.cc
ailed_datatypes_handler.cc
ailed_datatypes_handler.h
lue/autofill_data_type_controller.cc
lue/autofill_data_type_controller.h
lue/autofill_data_type_controller_unittest.cc
lue/autofill_profile_data_type_controller.cc
lue/autofill_profile_data_type_controller.h
lue/backend_data_type_configurer.h
lue/bookmark_change_processor.cc
lue/bookmark_model_associator.cc
lue/browser_thread_model_worker.cc
lue/browser_thread_model_worker_unittest.cc
lue/data_type_encryption_handler.cc
lue/data_type_encryption_handler.h
lue/data_type_manager.cc
lue/data_type_manager.h
lue/data_type_manager_impl.cc
lue/data_type_manager_impl.h
lue/data_type_manager_impl_unittest.cc
lue/data_type_manager_mock.h
lue/data_type_manager_observer.h
lue/failed_data_types_handler.cc
lue/failed_data_types_handler.h
lue/fake_data_type_controller.cc
lue/favicon_cache.cc
lue/favicon_cache_unittest.cc
lue/frontend_data_type_controller_unittest.cc
lue/generic_change_processor.cc
lue/generic_change_processor_unittest.cc
lue/history_model_worker.cc
lue/model_association_manager.cc
lue/model_association_manager.h
lue/model_association_manager_unittest.cc
lue/non_frontend_data_type_controller_unittest.cc
lue/non_ui_data_type_controller.cc
lue/non_ui_data_type_controller_unittest.cc
lue/password_change_processor.cc
lue/password_model_associator.cc
lue/password_model_worker.cc
lue/session_change_processor.cc
lue/session_model_associator.cc
lue/session_model_associator_unittest.cc
lue/shared_change_processor.cc
lue/sync_backend_host.cc
lue/sync_backend_host.h
lue/sync_backend_host_unittest.cc
lue/sync_backend_registrar.cc
lue/synced_device_tracker.cc
lue/synced_session_tracker.cc
lue/synced_session_tracker_unittest.cc
lue/synced_tab_delegate.cc
lue/synced_tab_delegate.h
lue/synced_tab_delegate_android.cc
lue/synced_tab_delegate_android.h
lue/synced_window_delegate_android.cc
lue/tab_node_pool.cc
lue/typed_url_change_processor.cc
lue/typed_url_model_associator.cc
lue/typed_url_model_associator.h
lue/typed_url_model_associator_unittest.cc
lue/ui_data_type_controller.cc
lue/ui_model_worker.cc
rofile_sync_components_factory.h
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl.h
rofile_sync_components_factory_mock.h
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_android.cc
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_base.h
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_harness.cc
rofile_sync_service_mock.h
rofile_sync_service_password_unittest.cc
rofile_sync_service_preference_unittest.cc
rofile_sync_service_session_unittest.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
ync_global_error_unittest.cc
ync_prefs.cc
ync_prefs.h
ync_ui_util.cc
ync_ui_util.h
ync_ui_util_unittest.cc
est/integration/autofill_helper.cc
est/integration/autofill_helper.h
est/integration/bookmarks_helper.cc
est/integration/enable_disable_test.cc
est/integration/extensions_helper.cc
est/integration/multiple_client_bookmarks_sync_test.cc
est/integration/multiple_client_passwords_sync_test.cc
est/integration/multiple_client_preferences_sync_test.cc
est/integration/multiple_client_sessions_sync_test.cc
est/integration/multiple_client_typed_urls_sync_test.cc
est/integration/passwords_helper.cc
est/integration/performance/autofill_sync_perf_test.cc
est/integration/performance/extensions_sync_perf_test.cc
est/integration/performance/passwords_sync_perf_test.cc
est/integration/performance/sessions_sync_perf_test.cc
est/integration/performance/typed_urls_sync_perf_test.cc
est/integration/search_engines_helper.cc
est/integration/search_engines_helper.h
est/integration/sync_app_helper.cc
est/integration/sync_extension_helper.cc
est/integration/sync_test.cc
est/integration/two_client_autofill_sync_test.cc
est/integration/two_client_bookmarks_sync_test.cc
est/integration/two_client_extension_settings_and_app_settings_sync_test.cc
est/integration/two_client_passwords_sync_test.cc
est/integration/two_client_preferences_sync_test.cc
est/integration/two_client_search_engines_sync_test.cc
est/integration/two_client_typed_urls_sync_test.cc
est/integration/typed_urls_helper.cc
est_profile_sync_service.cc
est_profile_sync_service.h
90dce4d38c5ff5333bea97d859d4e484e27edf0c 29-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r202854

This commit was generated by merge_to_master.py.

Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
bout_sync_util_unittest.cc
bstract_profile_sync_service_test.cc
bstract_profile_sync_service_test.h
ackend_migrator.cc
ackend_migrator_unittest.cc
lue/android_invalidator_bridge_proxy_unittest.cc
lue/android_invalidator_bridge_unittest.cc
lue/autofill_data_type_controller_unittest.cc
lue/bookmark_change_processor.cc
lue/bookmark_data_type_controller_unittest.cc
lue/bookmark_model_associator.cc
lue/browser_thread_model_worker.cc
lue/browser_thread_model_worker.h
lue/browser_thread_model_worker_unittest.cc
lue/chrome_extensions_activity_monitor_unittest.cc
lue/data_type_manager_impl.cc
lue/data_type_manager_impl_unittest.cc
lue/favicon_cache.cc
lue/favicon_cache.h
lue/favicon_cache_unittest.cc
lue/frontend_data_type_controller_unittest.cc
lue/generic_change_processor.cc
lue/generic_change_processor_unittest.cc
lue/history_model_worker.cc
lue/history_model_worker.h
lue/model_association_manager.cc
lue/model_association_manager_unittest.cc
lue/non_frontend_data_type_controller_unittest.cc
lue/non_ui_data_type_controller_unittest.cc
lue/password_change_processor.cc
lue/password_model_associator.cc
lue/password_model_worker.cc
lue/password_model_worker.h
lue/session_change_processor.cc
lue/session_model_associator.cc
lue/session_model_associator.h
lue/session_model_associator_unittest.cc
lue/shared_change_processor_unittest.cc
lue/sync_backend_host.cc
lue/sync_backend_host_unittest.cc
lue/sync_backend_registrar.cc
lue/sync_backend_registrar.h
lue/sync_backend_registrar_unittest.cc
lue/sync_start_util.cc
lue/synced_device_tracker_unittest.cc
lue/synced_tab_delegate.h
lue/typed_url_change_processor.cc
lue/typed_url_model_associator.cc
lue/ui_data_type_controller_unittest.cc
lue/ui_model_worker.cc
lue/ui_model_worker.h
lue/ui_model_worker_unittest.cc
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl_unittest.cc
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_android.cc
rofile_sync_service_android.h
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_factory.cc
rofile_sync_service_factory.h
rofile_sync_service_harness.cc
rofile_sync_service_harness.h
rofile_sync_service_mock.cc
rofile_sync_service_mock.h
rofile_sync_service_password_unittest.cc
rofile_sync_service_preference_unittest.cc
rofile_sync_service_session_unittest.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
rofile_sync_test_util.h
ync_global_error_unittest.cc
ync_prefs.cc
ync_prefs_unittest.cc
ync_ui_util.cc
ync_ui_util_unittest.cc
est/integration/autofill_helper.cc
est/integration/bookmarks_helper.cc
est/integration/dictionary_helper.cc
est/integration/passwords_helper.cc
est/integration/search_engines_helper.cc
est/integration/search_engines_helper.h
est/integration/single_client_bookmarks_sync_test.cc
est/integration/single_client_managed_user_settings_sync_test.cc
est/integration/sync_test.cc
est/integration/sync_test.h
est/integration/two_client_bookmarks_sync_test.cc
est/integration/two_client_search_engines_sync_test.cc
est_profile_sync_service.cc
est_profile_sync_service.h
a93a17c8d99d686bd4a1511e5504e5e6cc9fcadf 15-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r200144

This commit was generated by merge_to_master.py.

Change-Id: I85f3a249ae157fd8253431215fb2dfcd12ee9bf3
lue/autofill_data_type_controller_unittest.cc
lue/sync_backend_host.cc
lue/sync_backend_host.h
lue/sync_backend_host_unittest.cc
nvalidation_frontend.h
nvalidations/invalidator_storage.cc
nvalidations/invalidator_storage.h
nvalidations/invalidator_storage_unittest.cc
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_unittest.cc
ync_ui_util_unittest.cc
est/integration/single_client_managed_user_settings_sync_test.cc
est/integration/sync_test.h
est_profile_sync_service.cc
est_profile_sync_service.h
b2df76ea8fec9e32f6f3718986dba0d95315b29c 13-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r199464

This commit was generated by merge_to_master.py.

Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9
lue/android_invalidator_bridge_unittest.cc
lue/backend_data_type_configurer.h
lue/bookmark_change_processor.cc
lue/bookmark_data_type_controller.cc
lue/bookmark_model_associator.cc
lue/data_type_manager_impl.cc
lue/data_type_manager_impl.h
lue/data_type_manager_impl_unittest.cc
lue/model_association_manager.cc
lue/model_association_manager.h
lue/shared_change_processor.h
lue/sync_backend_host.cc
lue/sync_backend_host.h
lue/sync_backend_host_unittest.cc
nvalidations/invalidator_storage_unittest.cc
est/integration/sync_test.cc
est/integration/two_client_preferences_sync_test.cc
est_profile_sync_service.cc
est_profile_sync_service.h
c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d 09-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f
bstract_profile_sync_service_test.cc
bstract_profile_sync_service_test.h
ackend_migrator.cc
lue/android_invalidator_bridge.cc
lue/android_invalidator_bridge.h
lue/android_invalidator_bridge_proxy.cc
lue/android_invalidator_bridge_proxy.h
lue/android_invalidator_bridge_unittest.cc
lue/autofill_data_type_controller.cc
lue/autofill_data_type_controller.h
lue/autofill_data_type_controller_unittest.cc
lue/autofill_profile_data_type_controller.cc
lue/autofill_profile_data_type_controller.h
lue/bookmark_change_processor.cc
lue/bookmark_change_processor.h
lue/bookmark_data_type_controller.cc
lue/bookmark_data_type_controller.h
lue/bookmark_data_type_controller_unittest.cc
lue/bookmark_model_associator.cc
lue/bookmark_model_associator.h
lue/browser_thread_model_worker_unittest.cc
lue/change_processor_mock.cc
lue/data_type_manager_impl.cc
lue/device_info.cc
lue/favicon_cache.cc
lue/favicon_cache.h
lue/favicon_cache_unittest.cc
lue/generic_change_processor.cc
lue/history_model_worker.cc
lue/model_association_manager.cc
lue/non_frontend_data_type_controller.cc
lue/non_ui_data_type_controller.cc
lue/password_change_processor.h
lue/password_model_associator.h
lue/session_model_associator.cc
lue/session_model_associator.h
lue/session_model_associator_unittest.cc
lue/shared_change_processor.cc
lue/sync_backend_host.cc
lue/sync_backend_host.h
lue/sync_backend_host_unittest.cc
lue/sync_backend_registrar.cc
lue/sync_backend_registrar.h
lue/sync_start_util.cc
lue/sync_start_util.h
lue/synced_device_tracker.cc
lue/synced_device_tracker.h
lue/synced_session.h
lue/synced_session_tracker_unittest.cc
lue/tab_node_pool.cc
lue/typed_url_change_processor.h
lue/typed_url_model_associator.h
lue/typed_url_model_associator_unittest.cc
lue/ui_data_type_controller.cc
lue/ui_model_worker.h
nvalidations/invalidator_storage.cc
nvalidations/invalidator_storage.h
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl.h
rofile_sync_components_factory_impl_unittest.cc
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_android.cc
rofile_sync_service_android.h
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_factory.cc
rofile_sync_service_factory.h
rofile_sync_service_harness.cc
rofile_sync_service_harness.h
rofile_sync_service_mock.cc
rofile_sync_service_mock.h
rofile_sync_service_model_type_selection_android.h
rofile_sync_service_password_unittest.cc
rofile_sync_service_preference_unittest.cc
rofile_sync_service_session_unittest.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
ync_global_error.cc
ync_global_error.h
ync_global_error_unittest.cc
ync_prefs.cc
ync_prefs.h
ync_prefs_unittest.cc
ync_ui_util.cc
ync_ui_util.h
ync_ui_util_unittest.cc
est/integration/autofill_helper.cc
est/integration/autofill_helper.h
est/integration/bookmarks_helper.cc
est/integration/bookmarks_helper.h
est/integration/enable_disable_test.cc
est/integration/performance/autofill_sync_perf_test.cc
est/integration/sessions_helper.cc
est/integration/sessions_helper.h
est/integration/single_client_bookmarks_sync_test.cc
est/integration/single_client_managed_user_settings_sync_test.cc
est/integration/single_client_sessions_sync_test.cc
est/integration/sync_errors_test.cc
est/integration/sync_extension_helper.cc
est/integration/sync_test.cc
est/integration/two_client_apps_sync_test.cc
est/integration/two_client_autofill_sync_test.cc
est/integration/two_client_bookmarks_sync_test.cc
est/integration/two_client_preferences_sync_test.cc
est/integration/two_client_sessions_sync_test.cc
est_profile_sync_service.cc
est_profile_sync_service.h
2a99a7e74a7f215066514fe81d2bfa6639d9eddd 28-Mar-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
bout_sync_util.cc
bstract_profile_sync_service_test.cc
bstract_profile_sync_service_test.h
ackend_migrator.cc
ackend_migrator_unittest.cc
redential_cache_service_factory_win.cc
redential_cache_service_factory_win.h
redential_cache_service_win.cc
redential_cache_service_win.h
redential_cache_service_win_unittest.cc
lue/DEPS
lue/android_invalidator_bridge.cc
lue/android_invalidator_bridge.h
lue/android_invalidator_bridge_proxy.cc
lue/android_invalidator_bridge_proxy.h
lue/android_invalidator_bridge_proxy_unittest.cc
lue/android_invalidator_bridge_unittest.cc
lue/app_notification_data_type_controller.cc
lue/app_notification_data_type_controller.h
lue/app_notification_data_type_controller_unittest.cc
lue/autofill_data_type_controller.cc
lue/autofill_data_type_controller.h
lue/autofill_data_type_controller_unittest.cc
lue/autofill_profile_data_type_controller.cc
lue/autofill_profile_data_type_controller.h
lue/backend_data_type_configurer.cc
lue/backend_data_type_configurer.h
lue/bookmark_change_processor.cc
lue/bookmark_change_processor.h
lue/bookmark_data_type_controller.cc
lue/bookmark_data_type_controller.h
lue/bookmark_data_type_controller_unittest.cc
lue/bookmark_model_associator.cc
lue/bookmark_model_associator.h
lue/bridged_invalidator.cc
lue/bridged_invalidator.h
lue/bridged_invalidator_unittest.cc
lue/change_processor.cc
lue/chrome_encryptor.cc
lue/chrome_encryptor_unittest.cc
lue/chrome_extensions_activity_monitor.cc
lue/chrome_extensions_activity_monitor_unittest.cc
lue/chrome_sync_notification_bridge.cc
lue/chrome_sync_notification_bridge.h
lue/chrome_sync_notification_bridge_unittest.cc
lue/data_type_controller.cc
lue/data_type_controller.h
lue/data_type_controller_mock.h
lue/data_type_manager_impl.cc
lue/data_type_manager_impl.h
lue/data_type_manager_impl_unittest.cc
lue/device_info.cc
lue/device_info.h
lue/extension_setting_data_type_controller.cc
lue/extension_setting_data_type_controller.h
lue/fake_data_type_controller.cc
lue/fake_generic_change_processor.cc
lue/fake_generic_change_processor.h
lue/favicon_cache.cc
lue/favicon_cache.h
lue/favicon_cache_unittest.cc
lue/frontend_data_type_controller.cc
lue/frontend_data_type_controller.h
lue/frontend_data_type_controller_unittest.cc
lue/generic_change_processor.cc
lue/generic_change_processor.h
lue/history_model_worker.cc
lue/history_model_worker.h
lue/model_association_manager.cc
lue/model_association_manager.h
lue/model_association_manager_unittest.cc
lue/model_associator.h
lue/model_associator_mock.h
lue/new_non_frontend_data_type_controller.cc
lue/new_non_frontend_data_type_controller.h
lue/new_non_frontend_data_type_controller_mock.cc
lue/new_non_frontend_data_type_controller_mock.h
lue/new_non_frontend_data_type_controller_unittest.cc
lue/non_frontend_data_type_controller.cc
lue/non_frontend_data_type_controller.h
lue/non_frontend_data_type_controller_mock.h
lue/non_frontend_data_type_controller_unittest.cc
lue/non_ui_data_type_controller.cc
lue/non_ui_data_type_controller.h
lue/non_ui_data_type_controller_mock.cc
lue/non_ui_data_type_controller_mock.h
lue/non_ui_data_type_controller_unittest.cc
lue/password_change_processor.cc
lue/password_data_type_controller.cc
lue/password_model_associator.cc
lue/password_model_associator.h
lue/proxy_data_type_controller.cc
lue/proxy_data_type_controller.h
lue/search_engine_data_type_controller_unittest.cc
lue/session_change_processor.cc
lue/session_model_associator.cc
lue/session_model_associator.h
lue/session_model_associator_unittest.cc
lue/shared_change_processor.cc
lue/shared_change_processor.h
lue/shared_change_processor_mock.h
lue/shared_change_processor_unittest.cc
lue/sync_backend_host.cc
lue/sync_backend_host.h
lue/sync_backend_host_unittest.cc
lue/sync_backend_registrar.cc
lue/synced_device_tracker.cc
lue/synced_device_tracker.h
lue/synced_device_tracker_unittest.cc
lue/synced_window_delegate.h
lue/synced_window_delegate_android.cc
lue/tab_node_pool.cc
lue/tab_node_pool.h
lue/tab_node_pool_unittest.cc
lue/typed_url_change_processor.cc
lue/typed_url_data_type_controller.cc
lue/typed_url_data_type_controller.h
lue/typed_url_model_associator.cc
lue/typed_url_model_associator.h
lue/typed_url_model_associator_unittest.cc
lue/ui_data_type_controller.cc
lue/ui_data_type_controller.h
lue/ui_data_type_controller_unittest.cc
nvalidation_frontend.h
nvalidations/invalidator_storage.cc
nvalidations/invalidator_storage.h
nvalidations/invalidator_storage_unittest.cc
rofile_sync_components_factory.h
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl.h
rofile_sync_components_factory_impl_unittest.cc
rofile_sync_components_factory_mock.h
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_android.cc
rofile_sync_service_android.h
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_base.cc
rofile_sync_service_base.h
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_factory.cc
rofile_sync_service_harness.cc
rofile_sync_service_harness.h
rofile_sync_service_mock.cc
rofile_sync_service_mock.h
rofile_sync_service_model_type_selection_android.h
rofile_sync_service_observer.h
rofile_sync_service_password_unittest.cc
rofile_sync_service_preference_unittest.cc
rofile_sync_service_session_unittest.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
rofile_sync_test_util.h
esources/gaia_login.js
ync_global_error.cc
ync_global_error.h
ync_global_error_unittest.cc
ync_prefs.cc
ync_prefs.h
ync_prefs_unittest.cc
ync_ui_util.cc
ync_ui_util.h
ync_ui_util_mac.h
ync_ui_util_mac.mm
ync_ui_util_mac_unittest.mm
ync_ui_util_unittest.cc
est/integration/apps_helper.cc
est/integration/apps_helper.h
est/integration/autofill_helper.cc
est/integration/autofill_helper.h
est/integration/bookmarks_helper.cc
est/integration/bookmarks_helper.h
est/integration/dictionary_helper.cc
est/integration/dictionary_helper.h
est/integration/dictionary_load_observer.cc
est/integration/dictionary_load_observer.h
est/integration/enable_disable_test.cc
est/integration/extension_settings_helper.cc
est/integration/extensions_helper.cc
est/integration/migration_errors_test.cc
est/integration/multiple_client_bookmarks_sync_test.cc
est/integration/multiple_client_dictionary_sync_test.cc
est/integration/multiple_client_sessions_sync_test.cc
est/integration/passwords_helper.cc
est/integration/performance/autofill_sync_perf_test.cc
est/integration/performance/dictionary_sync_perf_test.cc
est/integration/performance/sessions_sync_perf_test.cc
est/integration/performance/sync_timing_helper.cc
est/integration/performance/typed_urls_sync_perf_test.cc
est/integration/preferences_helper.cc
est/integration/preferences_helper.h
est/integration/sessions_helper.cc
est/integration/single_client_apps_sync_test.cc
est/integration/single_client_bookmarks_sync_test.cc
est/integration/single_client_dictionary_sync_test.cc
est/integration/sync_app_helper.cc
est/integration/sync_errors_test.cc
est/integration/sync_extension_helper.cc
est/integration/sync_extension_helper.h
est/integration/sync_test.cc
est/integration/sync_test.h
est/integration/themes_helper.cc
est/integration/two_client_apps_sync_test.cc
est/integration/two_client_autofill_sync_test.cc
est/integration/two_client_bookmarks_sync_test.cc
est/integration/two_client_dictionary_sync_test.cc
est/integration/two_client_extension_settings_and_app_settings_sync_test.cc
est/integration/two_client_passwords_sync_test.cc
est/integration/two_client_preferences_sync_test.cc
est/integration/two_client_typed_urls_sync_test.cc
est/integration/typed_urls_helper.cc
est_profile_sync_service.cc
est_profile_sync_service.h
ser_selectable_sync_type.h
5821806d5e7f356e8fa4b058a389a808ea183019 14-Nov-2012 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
EPS
WNERS
RESUBMIT.py
bout_sync_util.cc
bout_sync_util.h
bout_sync_util_unittest.cc
bstract_profile_sync_service_test.cc
bstract_profile_sync_service_test.h
ackend_migrator.cc
ackend_migrator.h
ackend_migrator_unittest.cc
ackend_unrecoverable_error_handler.cc
ackend_unrecoverable_error_handler.h
redential_cache_service_factory_win.cc
redential_cache_service_factory_win.h
redential_cache_service_win.cc
redential_cache_service_win.h
redential_cache_service_win_unittest.cc
ailed_datatypes_handler.cc
ailed_datatypes_handler.h
lue/DEPS
lue/app_notification_data_type_controller.cc
lue/app_notification_data_type_controller.h
lue/app_notification_data_type_controller_unittest.cc
lue/autofill_data_type_controller.cc
lue/autofill_data_type_controller.h
lue/autofill_data_type_controller_unittest.cc
lue/autofill_profile_data_type_controller.cc
lue/autofill_profile_data_type_controller.h
lue/backend_data_type_configurer.h
lue/bookmark_change_processor.cc
lue/bookmark_change_processor.h
lue/bookmark_data_type_controller.cc
lue/bookmark_data_type_controller.h
lue/bookmark_data_type_controller_unittest.cc
lue/bookmark_model_associator.cc
lue/bookmark_model_associator.h
lue/bridged_invalidator.cc
lue/bridged_invalidator.h
lue/bridged_invalidator_unittest.cc
lue/browser_thread_model_worker.cc
lue/browser_thread_model_worker.h
lue/browser_thread_model_worker_unittest.cc
lue/change_processor.cc
lue/change_processor.h
lue/change_processor_mock.cc
lue/change_processor_mock.h
lue/chrome_encryptor.cc
lue/chrome_encryptor.h
lue/chrome_encryptor_unittest.cc
lue/chrome_extensions_activity_monitor.cc
lue/chrome_extensions_activity_monitor.h
lue/chrome_extensions_activity_monitor_unittest.cc
lue/chrome_report_unrecoverable_error.cc
lue/chrome_report_unrecoverable_error.h
lue/chrome_sync_notification_bridge.cc
lue/chrome_sync_notification_bridge.h
lue/chrome_sync_notification_bridge_unittest.cc
lue/data_type_controller.cc
lue/data_type_controller.h
lue/data_type_controller_mock.cc
lue/data_type_controller_mock.h
lue/data_type_error_handler.h
lue/data_type_error_handler_mock.cc
lue/data_type_error_handler_mock.h
lue/data_type_manager.cc
lue/data_type_manager.h
lue/data_type_manager_impl.cc
lue/data_type_manager_impl.h
lue/data_type_manager_impl_unittest.cc
lue/data_type_manager_mock.cc
lue/data_type_manager_mock.h
lue/data_type_manager_observer.h
lue/device_info.cc
lue/device_info.h
lue/extension_data_type_controller.cc
lue/extension_data_type_controller.h
lue/extension_setting_data_type_controller.cc
lue/extension_setting_data_type_controller.h
lue/fake_data_type_controller.cc
lue/fake_data_type_controller.h
lue/fake_generic_change_processor.cc
lue/fake_generic_change_processor.h
lue/frontend_data_type_controller.cc
lue/frontend_data_type_controller.h
lue/frontend_data_type_controller_mock.cc
lue/frontend_data_type_controller_mock.h
lue/frontend_data_type_controller_unittest.cc
lue/generic_change_processor.cc
lue/generic_change_processor.h
lue/history_model_worker.cc
lue/history_model_worker.h
lue/model_association_manager.cc
lue/model_association_manager.h
lue/model_association_manager_unittest.cc
lue/model_associator.h
lue/model_associator_mock.cc
lue/model_associator_mock.h
lue/new_non_frontend_data_type_controller.cc
lue/new_non_frontend_data_type_controller.h
lue/new_non_frontend_data_type_controller_mock.cc
lue/new_non_frontend_data_type_controller_mock.h
lue/new_non_frontend_data_type_controller_unittest.cc
lue/non_frontend_data_type_controller.cc
lue/non_frontend_data_type_controller.h
lue/non_frontend_data_type_controller_mock.cc
lue/non_frontend_data_type_controller_mock.h
lue/non_frontend_data_type_controller_unittest.cc
lue/password_change_processor.cc
lue/password_change_processor.h
lue/password_data_type_controller.cc
lue/password_data_type_controller.h
lue/password_model_associator.cc
lue/password_model_associator.h
lue/password_model_worker.cc
lue/password_model_worker.h
lue/search_engine_data_type_controller.cc
lue/search_engine_data_type_controller.h
lue/search_engine_data_type_controller_unittest.cc
lue/session_change_processor.cc
lue/session_change_processor.h
lue/session_data_type_controller.cc
lue/session_data_type_controller.h
lue/session_model_associator.cc
lue/session_model_associator.h
lue/session_model_associator_unittest.cc
lue/shared_change_processor.cc
lue/shared_change_processor.h
lue/shared_change_processor_mock.cc
lue/shared_change_processor_mock.h
lue/shared_change_processor_ref.cc
lue/shared_change_processor_ref.h
lue/shared_change_processor_unittest.cc
lue/sync_backend_host.cc
lue/sync_backend_host.h
lue/sync_backend_host_unittest.cc
lue/sync_backend_registrar.cc
lue/sync_backend_registrar.h
lue/sync_backend_registrar_unittest.cc
lue/synced_session.cc
lue/synced_session.h
lue/synced_session_tracker.cc
lue/synced_session_tracker.h
lue/synced_session_tracker_unittest.cc
lue/synced_tab_delegate.h
lue/synced_window_delegate.h
lue/synced_window_delegate_android.cc
lue/synced_window_delegate_android.h
lue/theme_data_type_controller.cc
lue/theme_data_type_controller.h
lue/typed_url_change_processor.cc
lue/typed_url_change_processor.h
lue/typed_url_data_type_controller.cc
lue/typed_url_data_type_controller.h
lue/typed_url_model_associator.cc
lue/typed_url_model_associator.h
lue/typed_url_model_associator_unittest.cc
lue/ui_data_type_controller.cc
lue/ui_data_type_controller.h
lue/ui_data_type_controller_unittest.cc
lue/ui_model_worker.cc
lue/ui_model_worker.h
lue/ui_model_worker_unittest.cc
nvalidation_frontend.h
nvalidations/invalidator_storage.cc
nvalidations/invalidator_storage.h
nvalidations/invalidator_storage_unittest.cc
rofile_sync_components_factory.h
rofile_sync_components_factory_impl.cc
rofile_sync_components_factory_impl.h
rofile_sync_components_factory_impl_unittest.cc
rofile_sync_components_factory_mock.cc
rofile_sync_components_factory_mock.h
rofile_sync_service.cc
rofile_sync_service.h
rofile_sync_service_autofill_unittest.cc
rofile_sync_service_bookmark_unittest.cc
rofile_sync_service_factory.cc
rofile_sync_service_factory.h
rofile_sync_service_harness.cc
rofile_sync_service_harness.h
rofile_sync_service_mock.cc
rofile_sync_service_mock.h
rofile_sync_service_password_unittest.cc
rofile_sync_service_preference_unittest.cc
rofile_sync_service_session_unittest.cc
rofile_sync_service_startup_unittest.cc
rofile_sync_service_typed_url_unittest.cc
rofile_sync_service_unittest.cc
rofile_sync_test_util.cc
rofile_sync_test_util.h
esources/gaia_login.css
esources/gaia_login.html
esources/gaia_login.js
esources/gaia_login_test.html
esources/google_transparent.png
etry_verifier.cc
etry_verifier.h
ync_global_error.cc
ync_global_error.h
ync_global_error_unittest.cc
ync_prefs.cc
ync_prefs.h
ync_prefs_unittest.cc
ync_ui_util.cc
ync_ui_util.h
ync_ui_util_mac.h
ync_ui_util_mac.mm
ync_ui_util_mac_unittest.mm
ync_ui_util_unittest.cc
est/integration/DEPS
est/integration/apps_helper.cc
est/integration/apps_helper.h
est/integration/autofill_helper.cc
est/integration/autofill_helper.h
est/integration/bookmarks_helper.cc
est/integration/bookmarks_helper.h
est/integration/cross_platform_sync_test.cc
est/integration/enable_disable_test.cc
est/integration/extension_settings_helper.cc
est/integration/extension_settings_helper.h
est/integration/extensions_helper.cc
est/integration/extensions_helper.h
est/integration/migration_errors_test.cc
est/integration/multiple_client_bookmarks_sync_test.cc
est/integration/multiple_client_passwords_sync_test.cc
est/integration/multiple_client_preferences_sync_test.cc
est/integration/multiple_client_sessions_sync_test.cc
est/integration/multiple_client_typed_urls_sync_test.cc
est/integration/passwords_helper.cc
est/integration/passwords_helper.h
est/integration/performance/autofill_sync_perf_test.cc
est/integration/performance/bookmarks_sync_perf_test.cc
est/integration/performance/extensions_sync_perf_test.cc
est/integration/performance/passwords_sync_perf_test.cc
est/integration/performance/sessions_sync_perf_test.cc
est/integration/performance/sync_timing_helper.cc
est/integration/performance/sync_timing_helper.h
est/integration/performance/typed_urls_sync_perf_test.cc
est/integration/preferences_helper.cc
est/integration/preferences_helper.h
est/integration/search_engines_helper.cc
est/integration/search_engines_helper.h
est/integration/sessions_helper.cc
est/integration/sessions_helper.h
est/integration/single_client_apps_sync_test.cc
est/integration/single_client_bookmarks_sync_test.cc
est/integration/single_client_extensions_sync_test.cc
est/integration/single_client_passwords_sync_test.cc
est/integration/single_client_preferences_sync_test.cc
est/integration/single_client_search_engines_sync_test.cc
est/integration/single_client_sessions_sync_test.cc
est/integration/single_client_themes_sync_test.cc
est/integration/single_client_typed_urls_sync_test.cc
est/integration/sync_app_helper.cc
est/integration/sync_app_helper.h
est/integration/sync_datatype_helper.cc
est/integration/sync_datatype_helper.h
est/integration/sync_errors_test.cc
est/integration/sync_extension_helper.cc
est/integration/sync_extension_helper.h
est/integration/sync_test.cc
est/integration/sync_test.h
est/integration/themes_helper.cc
est/integration/themes_helper.h
est/integration/two_client_apps_sync_test.cc
est/integration/two_client_autofill_sync_test.cc
est/integration/two_client_bookmarks_sync_test.cc
est/integration/two_client_extension_settings_and_app_settings_sync_test.cc
est/integration/two_client_extensions_sync_test.cc
est/integration/two_client_passwords_sync_test.cc
est/integration/two_client_preferences_sync_test.cc
est/integration/two_client_search_engines_sync_test.cc
est/integration/two_client_sessions_sync_test.cc
est/integration/two_client_themes_sync_test.cc
est/integration/two_client_typed_urls_sync_test.cc
est/integration/typed_urls_helper.cc
est/integration/typed_urls_helper.h
est/test_http_bridge_factory.cc
est/test_http_bridge_factory.h
est_profile_sync_service.cc
est_profile_sync_service.h
ser_selectable_sync_type.h