sync: Mass rename of non-blocking sync classes

sync/internal_api/sync_manager_impl.cc

Index: sync/internal_api/sync_manager_impl.cc
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
index a5f2de070f39214d01f033f47b6719e88d6f200a..bf733155ee7a377d006a2287ea8e0f1cd4c807ea 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -28,13 +28,13 @@
 #include "sync/internal_api/public/internal_components_factory.h"
 #include "sync/internal_api/public/read_node.h"
 #include "sync/internal_api/public/read_transaction.h"
-#include "sync/internal_api/public/sync_core_proxy.h"
+#include "sync/internal_api/public/sync_context_proxy.h"
 #include "sync/internal_api/public/user_share.h"
 #include "sync/internal_api/public/util/experiments.h"
 #include "sync/internal_api/public/write_node.h"
 #include "sync/internal_api/public/write_transaction.h"
-#include "sync/internal_api/sync_core.h"
-#include "sync/internal_api/sync_core_proxy_impl.h"
+#include "sync/internal_api/sync_context.h"
+#include "sync/internal_api/sync_context_proxy_impl.h"
 #include "sync/internal_api/syncapi_internal.h"
 #include "sync/internal_api/syncapi_server_connection_manager.h"
 #include "sync/notifier/invalidation_util.h"
@@ -390,15 +390,15 @@ void SyncManagerImpl::Init(
 
   model_type_registry_.reset(new ModelTypeRegistry(workers, directory()));
 
-  sync_core_.reset(new SyncCore(model_type_registry_.get()));
+  sync_context_.reset(new SyncContext(model_type_registry_.get()));
 
-  // Bind the SyncCore WeakPtr to this thread.  This helps us crash earlier if
-  // the pointer is misused in debug mode.
-  base::WeakPtr<SyncCore> weak_core = sync_core_->AsWeakPtr();
+  // Bind the SyncContext WeakPtr to this thread.  This helps us crash earlier
+  // if the pointer is misused in debug mode.
+  base::WeakPtr<SyncContext> weak_core = sync_context_->AsWeakPtr();
   weak_core.get();
 
-  sync_core_proxy_.reset(
-      new SyncCoreProxyImpl(base::MessageLoopProxy::current(), weak_core));
+  sync_context_proxy_.reset(
+      new SyncContextProxyImpl(base::MessageLoopProxy::current(), weak_core));
 
   // Build a SyncSessionContext and store the worker in it.
   DVLOG(1) << "Sync is bringing up SyncSessionContext.";
@@ -1022,9 +1022,9 @@ UserShare* SyncManagerImpl::GetUserShare() {
   return &share_;
 }
 
-syncer::SyncCoreProxy* SyncManagerImpl::GetSyncCoreProxy() {
+syncer::SyncContextProxy* SyncManagerImpl::GetSyncContextProxy() {
   DCHECK(initialized_);
-  return sync_core_proxy_.get();
+  return sync_context_proxy_.get();
 }
 
 const std::string SyncManagerImpl::cache_guid() {