sync: Mass rename of non-blocking sync classes

sync/internal_api/sync_context_proxy_impl.h

Index: sync/internal_api/sync_context_proxy_impl.h
diff --git a/sync/internal_api/sync_core_proxy_impl.h b/sync/internal_api/sync_context_proxy_impl.h
similarity index 54%
rename from sync/internal_api/sync_core_proxy_impl.h
rename to sync/internal_api/sync_context_proxy_impl.h
index 91061fefaaabcfcfe44f1e46c3cbf39fb2d8ff11..9d3b11311d02e3a3e94d0ad010fe1eb00a7af721 100644
--- a/sync/internal_api/sync_core_proxy_impl.h
+++ b/sync/internal_api/sync_context_proxy_impl.h
@@ -2,59 +2,59 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SYNC_INTERNAL_API_SYNC_CORE_PROXY_IMPL_H_
-#define SYNC_INTERNAL_API_SYNC_CORE_PROXY_IMPL_H_
+#ifndef SYNC_INTERNAL_API_SYNC_CONTEXT_PROXY_IMPL_H_
+#define SYNC_INTERNAL_API_SYNC_CONTEXT_PROXY_IMPL_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner.h"
 #include "sync/base/sync_export.h"
 #include "sync/internal_api/public/base/model_type.h"
-#include "sync/internal_api/public/sync_core_proxy.h"
+#include "sync/internal_api/public/sync_context_proxy.h"
 
 namespace syncer {
 
-class SyncCore;
-class NonBlockingTypeProcessor;
+class SyncContext;
+class ModelTypeSyncProxyImpl;
 struct DataTypeState;
 
-// Encapsulates a reference to the sync core and the thread it's running on.
-// Used by sync's data types to connect with the sync core.
+// Encapsulates a reference to the sync context and the thread it's running on.
+// Used by sync's data types to connect with the sync context.
 //
-// It is epxected that this object will be copied to and used on many different
+// It is expected that this object will be copied to and used on many different
 // threads.  It is small and safe to pass by value.
-class SYNC_EXPORT_PRIVATE SyncCoreProxyImpl : public SyncCoreProxy {
+class SYNC_EXPORT_PRIVATE SyncContextProxyImpl : public SyncContextProxy {
  public:
-  SyncCoreProxyImpl(
+  SyncContextProxyImpl(
       scoped_refptr<base::SequencedTaskRunner> sync_task_runner,
-      base::WeakPtr<SyncCore> sync_core);
-  virtual ~SyncCoreProxyImpl();
+      base::WeakPtr<SyncContext> sync_context);
+  virtual ~SyncContextProxyImpl();
 
-  // Attempts to connect a non-blocking type to the sync core.
+  // Attempts to connect a non-blocking type to the sync context.
   //
   // This may fail under some unusual circumstances, like shutdown.  Due to the
   // nature of WeakPtrs and cross-thread communication, the caller will be
   // unable to distinguish a slow success from failure.
   //
   // Must be called from the thread where the data type lives.
-  virtual void ConnectTypeToCore(
+  virtual void ConnectTypeToSync(
       syncer::ModelType type,
       const DataTypeState& data_type_state,
-      base::WeakPtr<NonBlockingTypeProcessor> type_processor) OVERRIDE;
+      base::WeakPtr<ModelTypeSyncProxyImpl> sync_proxy_impl) OVERRIDE;
 
   // Disables syncing for the given type on the sync thread.
   virtual void Disconnect(syncer::ModelType type) OVERRIDE;
 
-  virtual scoped_ptr<SyncCoreProxy> Clone() const OVERRIDE;
+  virtual scoped_ptr<SyncContextProxy> Clone() const OVERRIDE;
 
  private:
-  // A SequencedTaskRunner representing the thread where the SyncCore lives.
+  // A SequencedTaskRunner representing the thread where the SyncContext lives.
   scoped_refptr<base::SequencedTaskRunner> sync_task_runner_;
 
-  // The SyncCore this object is wrapping.
-  base::WeakPtr<SyncCore> sync_core_;
+  // The SyncContext this object is wrapping.
+  base::WeakPtr<SyncContext> sync_context_;
 };
 
 }  // namespace syncer
 
-#endif  // SYNC_INTERNAL_API_SYNC_CORE_PROXY_IMPL_H_
+#endif  // SYNC_INTERNAL_API_SYNC_CONTEXT_PROXY_IMPL_H_