26f4022d5f47db6a1123915de511e2339b70e2a2 - chromium/src

commit	26f4022d5f47db6a1123915de511e2339b70e2a2	[log] [tgz]
author	maxbogue <[email protected]>	Fri Sep 16 20:22:18 2016
committer	Commit bot <[email protected]>	Fri Sep 16 20:25:30 2016
tree	6d7de4123cec39a7a0d2d91525e49c3eb12b7d8f
parent	05c8461dff1ce44b6bb1d2675492078d332bd209 [diff]

[Sync] Merge //components/browser_sync into one directory.

These were originally split due to a weird usage by cloud_print, which
is no longer part of chromium.

- Moved all of ./browser and ./common into .
- Ran //tools/git/mass-rename.py
- Merged the build targets
- Ran git cl format
- Fixed lint errors in //components/browser_sync

BUG=646955
TBR=cpu

Review-Url: https://codereview.chromium.org/2345843003
Cr-Commit-Position: refs/heads/master@{#419268}

chrome/browser/BUILD.gn[diff]
chrome/browser/about_flags.cc[diff]
chrome/browser/android/chrome_startup_flags.cc[diff]
chrome/browser/android/contextualsearch/contextual_search_delegate.cc[diff]
chrome/browser/android/favicon_helper.cc[diff]
chrome/browser/android/foreign_session_helper.cc[diff]
chrome/browser/android/password_ui_view_android.cc[diff]
chrome/browser/android/preferences/pref_service_bridge.cc[diff]
chrome/browser/app_controller_mac.mm[diff]
chrome/browser/app_controller_mac_unittest.mm[diff]
chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc[diff]
chrome/browser/autocomplete/search_provider_unittest.cc[diff]
chrome/browser/browsing_data/browsing_data_counter_factory.cc[diff]
chrome/browser/browsing_data/history_counter_browsertest.cc[diff]
chrome/browser/chromeos/chrome_browser_main_chromeos.cc[diff]
chrome/browser/chromeos/extensions/input_method_api.cc[diff]
chrome/browser/chromeos/extensions/wallpaper_private_api.cc[diff]
chrome/browser/chromeos/login/signin/auth_sync_observer.cc[diff]
chrome/browser/chromeos/login/signin/oauth2_browsertest.cc[diff]
chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.cc[diff]
chrome/browser/drive/drive_notification_manager_factory.cc[diff]
chrome/browser/extensions/BUILD.gn[diff]
chrome/browser/extensions/api/gcm/gcm_apitest.cc[diff]
chrome/browser/extensions/api/sessions/sessions_api.cc[diff]
chrome/browser/extensions/api/sessions/sessions_apitest.cc[diff]
chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.cc[diff]
chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc[diff]
chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc[diff]
chrome/browser/extensions/extension_service_sync_unittest.cc[diff]
chrome/browser/extensions/external_pref_loader.h[diff]
chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc[diff]
chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc[diff]
chrome/browser/history/web_history_service_factory.cc[diff]
chrome/browser/password_manager/account_chooser_dialog_android.cc[diff]
chrome/browser/password_manager/auto_signin_first_run_dialog_android.cc[diff]
chrome/browser/password_manager/chrome_password_manager_client.cc[diff]
chrome/browser/password_manager/generated_password_saved_infobar_delegate_android.cc[diff]
chrome/browser/password_manager/password_store_factory.cc[diff]
chrome/browser/password_manager/save_password_infobar_delegate_android.cc[diff]
chrome/browser/password_manager/update_password_infobar_delegate_android.cc[diff]
chrome/browser/permissions/permission_uma_util.cc[diff]
chrome/browser/permissions/permission_uma_util_unittest.cc[diff]
chrome/browser/profiles/profile.cc[diff]
chrome/browser/profiles/profile_manager.cc[diff]
chrome/browser/profiles/profile_window.cc[diff]
chrome/browser/search/suggestions/suggestions_service_factory.cc[diff]
chrome/browser/signin/signin_tracker_unittest.cc[diff]
chrome/browser/signin/signin_ui_util.cc[diff]
chrome/browser/supervised_user/child_accounts/child_account_service.cc[diff]
chrome/browser/supervised_user/legacy/permission_request_creator_sync.cc[diff]
chrome/browser/supervised_user/supervised_user_service.cc[diff]
chrome/browser/sync/chrome_sync_client.cc[diff]
chrome/browser/sync/glue/sync_start_util.cc[diff]
chrome/browser/sync/profile_sync_service_android.cc[diff]
chrome/browser/sync/profile_sync_service_factory.cc[diff]
chrome/browser/sync/profile_sync_service_factory_unittest.cc[diff]
chrome/browser/sync/profile_sync_test_util.cc[diff]
chrome/browser/sync/profile_sync_test_util.h[diff]
chrome/browser/sync/sessions/sync_sessions_metrics_android.cc[diff]
chrome/browser/sync/sync_error_notifier_ash_unittest.cc[diff]
chrome/browser/sync/sync_error_notifier_factory_ash.cc[diff]
chrome/browser/sync/sync_global_error.cc[diff]
chrome/browser/sync/sync_global_error_factory.cc[diff]
chrome/browser/sync/sync_startup_tracker.cc[diff]
chrome/browser/sync/sync_ui_util.cc[diff]
chrome/browser/sync/sync_ui_util_unittest.cc[diff]
chrome/browser/sync/test/integration/autofill_helper.cc[diff]
chrome/browser/sync/test/integration/bookmarks_helper.cc[diff]
chrome/browser/sync/test/integration/enable_disable_test.cc[diff]
chrome/browser/sync/test/integration/migration_test.cc[diff]
chrome/browser/sync/test/integration/migration_watcher.cc[diff]
chrome/browser/sync/test/integration/multi_client_status_change_checker.cc[diff]
chrome/browser/sync/test/integration/p2p_invalidation_forwarder.cc[diff]
chrome/browser/sync/test/integration/p2p_sync_refresher.cc[diff]
chrome/browser/sync/test/integration/password_manager_setting_migrator_helper.cc[diff]
chrome/browser/sync/test/integration/passwords_helper.cc[diff]
chrome/browser/sync/test/integration/passwords_helper.h[diff]
chrome/browser/sync/test/integration/profile_sync_service_harness.cc[diff]
chrome/browser/sync/test/integration/quiesce_status_change_checker.cc[diff]
chrome/browser/sync/test/integration/sessions_helper.cc[diff]
chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc[diff]
chrome/browser/sync/test/integration/single_client_apps_sync_test.cc[diff]
chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc[diff]
chrome/browser/sync/test/integration/single_client_dictionary_sync_test.cc[diff]
chrome/browser/sync/test/integration/single_client_directory_sync_test.cc[diff]
chrome/browser/sync/test/integration/single_client_extensions_sync_test.cc[diff]
chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc[diff]
chrome/browser/sync/test/integration/single_client_preferences_sync_test.cc[diff]
chrome/browser/sync/test/integration/single_client_search_engines_sync_test.cc[diff]
chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc[diff]
chrome/browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc[diff]
chrome/browser/sync/test/integration/single_client_themes_sync_test.cc[diff]
chrome/browser/sync/test/integration/single_client_typed_urls_sync_test.cc[diff]
chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc[diff]
chrome/browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc[diff]
chrome/browser/sync/test/integration/sync_auth_test.cc[diff]
chrome/browser/sync/test/integration/sync_errors_test.cc[diff]
chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc[diff]
chrome/browser/sync/test/integration/sync_integration_test_util.cc[diff]
chrome/browser/sync/test/integration/sync_test.cc[diff]
chrome/browser/sync/test/integration/two_client_uss_sync_test.cc[diff]
chrome/browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc[diff]
chrome/browser/sync/test/integration/updated_progress_marker_checker.cc[diff]
chrome/browser/ui/BUILD.gn[diff]
chrome/browser/ui/android/tab_model/tab_model.cc[diff]
chrome/browser/ui/app_list/search/suggestions/suggestions_search_provider.cc[diff]
chrome/browser/ui/ash/app_sync_ui_state.cc[diff]
chrome/browser/ui/autofill/chrome_autofill_client.cc[diff]
chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc[diff]
chrome/browser/ui/avatar_button_error_controller.cc[diff]
chrome/browser/ui/browser.cc[diff]
chrome/browser/ui/browser_command_controller.cc[diff]
chrome/browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm[diff]
chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm[diff]
chrome/browser/ui/passwords/manage_passwords_bubble_model.cc[diff]
chrome/browser/ui/passwords/manage_passwords_bubble_model_unittest.cc[diff]
chrome/browser/ui/passwords/manage_passwords_view_utils.cc[diff]
chrome/browser/ui/passwords/manage_passwords_view_utils_desktop_unittest.cc[diff]
chrome/browser/ui/passwords/password_dialog_controller_impl.cc[diff]
chrome/browser/ui/passwords/password_manager_presenter.cc[diff]
chrome/browser/ui/search/search_tab_helper.cc[diff]
chrome/browser/ui/search/search_tab_helper_unittest.cc[diff]
chrome/browser/ui/sync/one_click_signin_sync_observer.cc[diff]
chrome/browser/ui/sync/one_click_signin_sync_observer_unittest.cc[diff]
chrome/browser/ui/sync/one_click_signin_sync_starter.cc[diff]
chrome/browser/ui/sync/one_click_signin_sync_starter_unittest.cc[diff]
chrome/browser/ui/sync/profile_signin_confirmation_helper.cc[diff]
chrome/browser/ui/sync/sync_promo_ui_unittest.cc[diff]
chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc[diff]
chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc[diff]
chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc[diff]
chrome/browser/ui/views/profiles/profile_chooser_view.cc[diff]
chrome/browser/ui/webui/app_launcher_login_handler.cc[diff]
chrome/browser/ui/webui/browsing_history_handler.cc[diff]
chrome/browser/ui/webui/browsing_history_handler_unittest.cc[diff]
chrome/browser/ui/webui/favicon_source.cc[diff]
chrome/browser/ui/webui/foreign_session_handler.cc[diff]
chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc[diff]
chrome/browser/ui/webui/ntp/ntp_resource_cache.cc[diff]
chrome/browser/ui/webui/ntp/ntp_user_data_logger.cc[diff]
chrome/browser/ui/webui/options/browser_options_handler.cc[diff]
chrome/browser/ui/webui/options/clear_browser_data_handler.h[diff]
chrome/browser/ui/webui/options/create_profile_handler.cc[diff]
chrome/browser/ui/webui/options/manage_profile_handler.cc[diff]
chrome/browser/ui/webui/options/password_manager_handler.cc[diff]
chrome/browser/ui/webui/options/sync_setup_handler.cc[diff]
chrome/browser/ui/webui/settings/people_handler.cc[diff]
chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h[diff]
chrome/browser/ui/webui/signin/inline_login_handler_impl.cc[diff]
chrome/browser/ui/webui/signin/signin_create_profile_handler.cc[diff]
chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc[diff]
chrome/browser/ui/webui/sync_internals_message_handler.cc[diff]
chrome/browser/ui/webui/sync_internals_message_handler_unittest.cc[diff]
chrome/browser/ui/webui/sync_internals_ui_unittest.cc[diff]
chrome/test/BUILD.gn[diff]
components/BUILD.gn[diff]
components/browser_sync/BUILD.gn[Renamed from components/browser_sync/browser/BUILD.gn - diff]
components/browser_sync/DEPS[Renamed from components/browser_sync/browser/DEPS - diff]
components/browser_sync/abstract_profile_sync_service_test.cc[Renamed from components/browser_sync/browser/abstract_profile_sync_service_test.cc - diff]
components/browser_sync/abstract_profile_sync_service_test.h[Renamed from components/browser_sync/browser/abstract_profile_sync_service_test.h - diff]
components/browser_sync/browser_sync_switches.cc[Renamed from components/browser_sync/common/browser_sync_switches.cc - diff]
components/browser_sync/browser_sync_switches.h[Renamed from components/browser_sync/common/browser_sync_switches.h - diff]
components/browser_sync/common/BUILD.gn[Deleted - diff]
components/browser_sync/profile_sync_components_factory_impl.cc[Renamed from components/browser_sync/browser/profile_sync_components_factory_impl.cc - diff]
components/browser_sync/profile_sync_components_factory_impl.h[Renamed from components/browser_sync/browser/profile_sync_components_factory_impl.h - diff]
components/browser_sync/profile_sync_service.cc[Renamed from components/browser_sync/browser/profile_sync_service.cc - diff]
components/browser_sync/profile_sync_service.h[Renamed from components/browser_sync/browser/profile_sync_service.h - diff]
components/browser_sync/profile_sync_service_autofill_unittest.cc[Renamed from components/browser_sync/browser/profile_sync_service_autofill_unittest.cc - diff]
components/browser_sync/profile_sync_service_bookmark_unittest.cc[Renamed from components/browser_sync/browser/profile_sync_service_bookmark_unittest.cc - diff]
components/browser_sync/profile_sync_service_mock.cc[Renamed from components/browser_sync/browser/profile_sync_service_mock.cc - diff]
components/browser_sync/profile_sync_service_mock.h[Renamed from components/browser_sync/browser/profile_sync_service_mock.h - diff]
components/browser_sync/profile_sync_service_startup_unittest.cc[Renamed from components/browser_sync/browser/profile_sync_service_startup_unittest.cc - diff]
components/browser_sync/profile_sync_service_typed_url_unittest.cc[Renamed from components/browser_sync/browser/profile_sync_service_typed_url_unittest.cc - diff]
components/browser_sync/profile_sync_service_unittest.cc[Renamed from components/browser_sync/browser/profile_sync_service_unittest.cc - diff]
components/browser_sync/profile_sync_test_util.cc[Renamed from components/browser_sync/browser/profile_sync_test_util.cc - diff]
components/browser_sync/profile_sync_test_util.h[Renamed from components/browser_sync/browser/profile_sync_test_util.h - diff]
components/browser_sync/signin_confirmation_helper.cc[Renamed from components/browser_sync/browser/signin_confirmation_helper.cc - diff]
components/browser_sync/signin_confirmation_helper.h[Renamed from components/browser_sync/browser/signin_confirmation_helper.h - diff]
components/browser_sync/test_http_bridge_factory.cc[Renamed from components/browser_sync/browser/test_http_bridge_factory.cc - diff]
components/browser_sync/test_http_bridge_factory.h[Renamed from components/browser_sync/browser/test_http_bridge_factory.h - diff]
components/browser_sync/test_profile_sync_service.cc[Renamed from components/browser_sync/browser/test_profile_sync_service.cc - diff]
components/browser_sync/test_profile_sync_service.h[Renamed from components/browser_sync/browser/test_profile_sync_service.h - diff]
components/browsing_data_ui/DEPS[diff]
ios/chrome/browser/BUILD.gn[diff]
ios/chrome/browser/DEPS[diff]
ios/chrome/browser/autocomplete/autocomplete_provider_client_impl.cc[diff]
ios/chrome/browser/browser_state/chrome_browser_state_manager_impl.cc[diff]
ios/chrome/browser/history/web_history_service_factory.cc[diff]
ios/chrome/browser/passwords/ios_chrome_password_manager_client.mm[diff]
ios/chrome/browser/passwords/ios_chrome_password_store_factory.cc[diff]
ios/chrome/browser/passwords/password_controller.mm[diff]
ios/chrome/browser/suggestions/suggestions_service_factory.mm[diff]
ios/chrome/browser/sync/glue/sync_start_util.cc[diff]
ios/chrome/browser/sync/ios_chrome_profile_sync_service_factory.cc[diff]
ios/chrome/browser/sync/ios_chrome_profile_sync_test_util.cc[diff]
ios/chrome/browser/sync/ios_chrome_profile_sync_test_util.h[diff]
ios/chrome/browser/sync/ios_chrome_sync_client.mm[diff]
ios/chrome/browser/sync/sync_setup_service_factory.cc[diff]
ios/chrome/browser/ui/webui/history/browsing_history_handler.cc[diff]
ios/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.cc[diff]

200 files changed