| Index: components/browser_sync/profile_sync_service.cc
 | 
| diff --git a/components/browser_sync/profile_sync_service.cc b/components/browser_sync/profile_sync_service.cc
 | 
| index b08d4917cf62066f540414323d34ffbf462ce6cb..0b9152f3ca5e0f83cbf97a5e9fe344a67dbaac3c 100644
 | 
| --- a/components/browser_sync/profile_sync_service.cc
 | 
| +++ b/components/browser_sync/profile_sync_service.cc
 | 
| @@ -8,29 +8,22 @@
 | 
|  
 | 
|  #include <cstddef>
 | 
|  #include <map>
 | 
| -#include <utility>
 | 
| -#include <vector>
 | 
|  
 | 
|  #include "base/bind.h"
 | 
|  #include "base/bind_helpers.h"
 | 
|  #include "base/callback.h"
 | 
|  #include "base/command_line.h"
 | 
| -#include "base/compiler_specific.h"
 | 
|  #include "base/feature_list.h"
 | 
|  #include "base/files/file_util.h"
 | 
|  #include "base/logging.h"
 | 
| -#include "base/macros.h"
 | 
|  #include "base/memory/ptr_util.h"
 | 
|  #include "base/memory/ref_counted.h"
 | 
|  #include "base/metrics/histogram.h"
 | 
|  #include "base/profiler/scoped_tracker.h"
 | 
|  #include "base/single_thread_task_runner.h"
 | 
| -#include "base/strings/string16.h"
 | 
|  #include "base/strings/stringprintf.h"
 | 
|  #include "base/threading/thread_restrictions.h"
 | 
|  #include "base/threading/thread_task_runner_handle.h"
 | 
| -#include "base/time/time.h"
 | 
| -#include "build/build_config.h"
 | 
|  #include "components/autofill/core/common/autofill_pref_names.h"
 | 
|  #include "components/browser_sync/browser_sync_switches.h"
 | 
|  #include "components/history/core/browser/typed_url_data_type_controller.h"
 | 
| @@ -46,7 +39,6 @@
 | 
|  #include "components/sync/api/model_type_store.h"
 | 
|  #include "components/sync/api/sync_error.h"
 | 
|  #include "components/sync/base/cryptographer.h"
 | 
| -#include "components/sync/base/experiments.h"
 | 
|  #include "components/sync/base/passphrase_type.h"
 | 
|  #include "components/sync/base/stop_source.h"
 | 
|  #include "components/sync/base/sync_db_util.h"
 | 
| @@ -54,7 +46,6 @@
 | 
|  #include "components/sync/core/http_bridge_network_resources.h"
 | 
|  #include "components/sync/core/network_resources.h"
 | 
|  #include "components/sync/core/shared_model_type_processor.h"
 | 
| -#include "components/sync/core/shutdown_reason.h"
 | 
|  #include "components/sync/core/sync_encryption_handler.h"
 | 
|  #include "components/sync/device_info/device_info.h"
 | 
|  #include "components/sync/device_info/device_info_service.h"
 | 
| @@ -62,18 +53,14 @@
 | 
|  #include "components/sync/device_info/device_info_tracker.h"
 | 
|  #include "components/sync/driver/backend_migrator.h"
 | 
|  #include "components/sync/driver/change_processor.h"
 | 
| -#include "components/sync/driver/data_type_controller.h"
 | 
|  #include "components/sync/driver/directory_data_type_controller.h"
 | 
|  #include "components/sync/driver/glue/chrome_report_unrecoverable_error.h"
 | 
| -#include "components/sync/driver/glue/sync_backend_host.h"
 | 
|  #include "components/sync/driver/glue/sync_backend_host_impl.h"
 | 
|  #include "components/sync/driver/pref_names.h"
 | 
|  #include "components/sync/driver/signin_manager_wrapper.h"
 | 
|  #include "components/sync/driver/sync_api_component_factory.h"
 | 
| -#include "components/sync/driver/sync_client.h"
 | 
|  #include "components/sync/driver/sync_driver_switches.h"
 | 
|  #include "components/sync/driver/sync_error_controller.h"
 | 
| -#include "components/sync/driver/sync_stopped_reporter.h"
 | 
|  #include "components/sync/driver/sync_type_preference_provider.h"
 | 
|  #include "components/sync/driver/sync_util.h"
 | 
|  #include "components/sync/driver/system_encryptor.h"
 | 
| 
 |