[Sync] Remove SyncableServiceAdapter.

chrome/chrome_browser.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 2310 matching lines @@
         'browser/sync/glue/data_type_manager_impl.cc',
         'browser/sync/glue/data_type_manager_impl.h',
         'browser/sync/glue/extension_data_type_controller.cc',
         'browser/sync/glue/extension_data_type_controller.h',
         'browser/sync/glue/extension_setting_data_type_controller.cc',
         'browser/sync/glue/extension_setting_data_type_controller.h',
         'browser/sync/glue/frontend_data_type_controller.cc',
         'browser/sync/glue/frontend_data_type_controller.h',
         'browser/sync/glue/generic_change_processor.cc',
         'browser/sync/glue/generic_change_processor.h',
+        'browser/sync/glue/generic_ui_data_type_controller.cc',
+        'browser/sync/glue/generic_ui_data_type_controller.h',
         'browser/sync/glue/history_model_worker.cc',
         'browser/sync/glue/history_model_worker.h',
         'browser/sync/glue/http_bridge.cc',
         'browser/sync/glue/http_bridge.h',
         'browser/sync/glue/model_associator.h',
         'browser/sync/glue/new_non_frontend_data_type_controller.cc',
         'browser/sync/glue/new_non_frontend_data_type_controller.h',
         'browser/sync/glue/non_frontend_data_type_controller.cc',
         'browser/sync/glue/non_frontend_data_type_controller.h',
         'browser/sync/glue/password_change_processor.cc',
         'browser/sync/glue/password_change_processor.h',
         'browser/sync/glue/password_data_type_controller.cc',
         'browser/sync/glue/password_data_type_controller.h',
         'browser/sync/glue/password_model_associator.cc',
         'browser/sync/glue/password_model_associator.h',
         'browser/sync/glue/password_model_worker.cc',
         'browser/sync/glue/password_model_worker.h',
-        'browser/sync/glue/preference_data_type_controller.cc',
-        'browser/sync/glue/preference_data_type_controller.h',
         'browser/sync/glue/search_engine_data_type_controller.cc',
         'browser/sync/glue/search_engine_data_type_controller.h',
         'browser/sync/glue/session_change_processor.cc',
         'browser/sync/glue/session_change_processor.h',
         'browser/sync/glue/session_data_type_controller.cc',
         'browser/sync/glue/session_data_type_controller.h',
         'browser/sync/glue/session_model_associator.cc',
         'browser/sync/glue/session_model_associator.h',
         'browser/sync/glue/shared_change_processor.cc',
         'browser/sync/glue/shared_change_processor.h',
         'browser/sync/glue/shared_change_processor_ref.h',
         'browser/sync/glue/shared_change_processor_ref.cc',
-        'browser/sync/glue/syncable_service_adapter.cc',
-        'browser/sync/glue/syncable_service_adapter.h',
         'browser/sync/glue/synced_session.h',
         'browser/sync/glue/synced_session.cc',
         'browser/sync/glue/synced_window_delegate.h',
         'browser/sync/glue/sync_backend_host.cc',
         'browser/sync/glue/sync_backend_host.h',
         'browser/sync/glue/sync_backend_registrar.cc',
         'browser/sync/glue/sync_backend_registrar.h',
         'browser/sync/glue/synced_session_tracker.cc',
         'browser/sync/glue/synced_session_tracker.h',
         'browser/sync/glue/theme_change_processor.cc',
         'browser/sync/glue/theme_change_processor.h',
         'browser/sync/glue/theme_data_type_controller.cc',
         'browser/sync/glue/theme_data_type_controller.h',
         'browser/sync/glue/theme_model_associator.cc',
         'browser/sync/glue/theme_model_associator.h',
         'browser/sync/glue/theme_util.cc',
         'browser/sync/glue/theme_util.h',
         'browser/sync/glue/typed_url_change_processor.cc',
         'browser/sync/glue/typed_url_change_processor.h',
         'browser/sync/glue/typed_url_data_type_controller.cc',
         'browser/sync/glue/typed_url_data_type_controller.h',
         'browser/sync/glue/typed_url_model_associator.cc',
         'browser/sync/glue/typed_url_model_associator.h',
+        'browser/sync/glue/ui_data_type_controller.cc',
+        'browser/sync/glue/ui_data_type_controller.h',
         'browser/sync/glue/ui_model_worker.cc',
         'browser/sync/glue/ui_model_worker.h',
         'browser/sync/backend_migrator.cc',
         'browser/sync/backend_migrator.h',
         'browser/sync/backend_unrecoverable_error_handler.cc',
         'browser/sync/backend_unrecoverable_error_handler.h',
         'browser/sync/failed_datatypes_handler.cc',
         'browser/sync/failed_datatypes_handler.h',
         'browser/sync/profile_sync_components_factory.h',
         'browser/sync/profile_sync_components_factory_impl.cc',
@@ skipping 3180 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
       'variables': {
         'proto_in_dir': 'browser/history',
         'proto_out_dir': 'chrome/browser/history',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }