| Index: sync/internal_api/sync_context_proxy_impl_unittest.cc
 | 
| diff --git a/sync/internal_api/sync_context_proxy_impl_unittest.cc b/sync/internal_api/sync_context_proxy_impl_unittest.cc
 | 
| index 1bb8f19c203c7c4a34617e4d8727578082233eca..00fe80c1543aef335714098f2992ae233f4377e4 100644
 | 
| --- a/sync/internal_api/sync_context_proxy_impl_unittest.cc
 | 
| +++ b/sync/internal_api/sync_context_proxy_impl_unittest.cc
 | 
| @@ -6,7 +6,7 @@
 | 
|  #include "base/run_loop.h"
 | 
|  #include "base/sequenced_task_runner.h"
 | 
|  #include "base/thread_task_runner_handle.h"
 | 
| -#include "sync/engine/model_type_sync_proxy_impl.h"
 | 
| +#include "sync/engine/model_type_processor_impl.h"
 | 
|  #include "sync/internal_api/public/base/model_type.h"
 | 
|  #include "sync/internal_api/public/sync_context.h"
 | 
|  #include "sync/internal_api/sync_context_proxy_impl.h"
 | 
| @@ -58,7 +58,7 @@ class SyncContextProxyImplTest : public ::testing::Test {
 | 
|  
 | 
|  // Try to connect a type to a SyncContext that has already shut down.
 | 
|  TEST_F(SyncContextProxyImplTest, FailToConnect1) {
 | 
| -  ModelTypeSyncProxyImpl themes_sync_proxy(syncer::THEMES);
 | 
| +  ModelTypeProcessorImpl themes_sync_proxy(syncer::THEMES);
 | 
|    DisableSync();
 | 
|    themes_sync_proxy.Enable(GetProxy());
 | 
|  
 | 
| @@ -69,7 +69,7 @@ TEST_F(SyncContextProxyImplTest, FailToConnect1) {
 | 
|  
 | 
|  // Try to connect a type to a SyncContext as it shuts down.
 | 
|  TEST_F(SyncContextProxyImplTest, FailToConnect2) {
 | 
| -  ModelTypeSyncProxyImpl themes_sync_proxy(syncer::THEMES);
 | 
| +  ModelTypeProcessorImpl themes_sync_proxy(syncer::THEMES);
 | 
|    themes_sync_proxy.Enable(GetProxy());
 | 
|    DisableSync();
 | 
|  
 | 
| @@ -80,8 +80,8 @@ TEST_F(SyncContextProxyImplTest, FailToConnect2) {
 | 
|  
 | 
|  // Tests the case where the type's sync proxy shuts down first.
 | 
|  TEST_F(SyncContextProxyImplTest, TypeDisconnectsFirst) {
 | 
| -  scoped_ptr<ModelTypeSyncProxyImpl> themes_sync_proxy(
 | 
| -      new ModelTypeSyncProxyImpl(syncer::THEMES));
 | 
| +  scoped_ptr<ModelTypeProcessorImpl> themes_sync_proxy(
 | 
| +      new ModelTypeProcessorImpl(syncer::THEMES));
 | 
|    themes_sync_proxy->Enable(GetProxy());
 | 
|  
 | 
|    base::RunLoop run_loop_;
 | 
| @@ -93,8 +93,8 @@ TEST_F(SyncContextProxyImplTest, TypeDisconnectsFirst) {
 | 
|  
 | 
|  // Tests the case where the sync thread shuts down first.
 | 
|  TEST_F(SyncContextProxyImplTest, SyncDisconnectsFirst) {
 | 
| -  scoped_ptr<ModelTypeSyncProxyImpl> themes_sync_proxy(
 | 
| -      new ModelTypeSyncProxyImpl(syncer::THEMES));
 | 
| +  scoped_ptr<ModelTypeProcessorImpl> themes_sync_proxy(
 | 
| +      new ModelTypeProcessorImpl(syncer::THEMES));
 | 
|    themes_sync_proxy->Enable(GetProxy());
 | 
|  
 | 
|    base::RunLoop run_loop_;
 | 
| 
 |