| Index: sync/sync.gyp
 | 
| diff --git a/sync/sync.gyp b/sync/sync.gyp
 | 
| index 4bacdb07cd0bc5adac7055e267f07d7b35bf249a..4ad6b36d35720cac07354b8347315b2a6ac99444 100644
 | 
| --- a/sync/sync.gyp
 | 
| +++ b/sync/sync.gyp
 | 
| @@ -135,10 +135,6 @@
 | 
|          'engine/get_updates_processor.h',
 | 
|          'engine/model_type_entity.cc',
 | 
|          'engine/model_type_entity.h',
 | 
| -        'engine/model_type_processor.cc',
 | 
| -        'engine/model_type_processor.h',
 | 
| -        'engine/model_type_processor_impl.cc',
 | 
| -        'engine/model_type_processor_impl.h',
 | 
|          'engine/model_type_worker.cc',
 | 
|          'engine/model_type_worker.h',
 | 
|          'engine/net/server_connection_manager.cc',
 | 
| @@ -285,6 +281,8 @@
 | 
|          'internal_api/public/http_post_provider_interface.h',
 | 
|          'internal_api/public/internal_components_factory.h',
 | 
|          'internal_api/public/internal_components_factory_impl.h',
 | 
| +        'internal_api/public/model_type_processor.cc',
 | 
| +        'internal_api/public/model_type_processor.h',
 | 
|          'internal_api/public/network_resources.h',
 | 
|          'internal_api/public/non_blocking_sync_common.cc',
 | 
|          'internal_api/public/non_blocking_sync_common.h',
 | 
| @@ -302,6 +300,7 @@
 | 
|          'internal_api/public/sessions/type_debug_info_observer.h',
 | 
|          'internal_api/public/sessions/update_counters.cc',
 | 
|          'internal_api/public/sessions/update_counters.h',
 | 
| +        'internal_api/public/shared_model_type_processor.h',
 | 
|          'internal_api/public/shutdown_reason.h',
 | 
|          'internal_api/public/sync_auth_provider.h',
 | 
|          'internal_api/public/sync_context.h',
 | 
| @@ -328,6 +327,7 @@
 | 
|          'internal_api/public/write_transaction.h',
 | 
|          'internal_api/read_node.cc',
 | 
|          'internal_api/read_transaction.cc',
 | 
| +        'internal_api/shared_model_type_processor.cc',
 | 
|          'internal_api/sync_backup_manager.cc',
 | 
|          'internal_api/sync_backup_manager.h',
 | 
|          'internal_api/sync_context.cc',
 | 
| 
 |