| Index: chrome/browser/sync/glue/sync_backend_host_impl.h
|
| diff --git a/chrome/browser/sync/glue/sync_backend_host_impl.h b/chrome/browser/sync/glue/sync_backend_host_impl.h
|
| index b347a99b7b0ff70a85d21f7d291ea2e10e05409e..2eb601410f058905b7c0ec340bb5ec2fa2365a6b 100644
|
| --- a/chrome/browser/sync/glue/sync_backend_host_impl.h
|
| +++ b/chrome/browser/sync/glue/sync_backend_host_impl.h
|
| @@ -115,7 +115,7 @@ class SyncBackendHostImpl
|
| virtual void DeactivateDataType(syncer::ModelType type) OVERRIDE;
|
| virtual void EnableEncryptEverything() OVERRIDE;
|
| virtual syncer::UserShare* GetUserShare() const OVERRIDE;
|
| - virtual scoped_ptr<syncer::SyncCoreProxy> GetSyncCoreProxy() OVERRIDE;
|
| + virtual scoped_ptr<syncer::SyncContextProxy> GetSyncContextProxy() OVERRIDE;
|
| virtual Status GetDetailedStatus() OVERRIDE;
|
| virtual syncer::sessions::SyncSessionSnapshot
|
| GetLastSessionSnapshot() const OVERRIDE;
|
| @@ -170,14 +170,14 @@ class SyncBackendHostImpl
|
| // Reports backend initialization success. Includes some objects from sync
|
| // manager initialization to be passed back to the UI thread.
|
| //
|
| - // |sync_core_proxy| points to an object owned by the SyncManager. Ownership
|
| - // is not transferred, but we can obtain our own copy of the object using its
|
| - // Clone() method.
|
| + // |sync_context_proxy| points to an object owned by the SyncManager.
|
| + // Ownership is not transferred, but we can obtain our own copy of the object
|
| + // using its Clone() method.
|
| virtual void HandleInitializationSuccessOnFrontendLoop(
|
| - const syncer::WeakHandle<syncer::JsBackend> js_backend,
|
| - const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>
|
| - debug_info_listener,
|
| - syncer::SyncCoreProxy* sync_core_proxy);
|
| + const syncer::WeakHandle<syncer::JsBackend> js_backend,
|
| + const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>
|
| + debug_info_listener,
|
| + syncer::SyncContextProxy* sync_context_proxy);
|
|
|
| // Downloading of control types failed and will be retried. Invokes the
|
| // frontend's sync configure retry method.
|
| @@ -324,7 +324,7 @@ class SyncBackendHostImpl
|
| scoped_refptr<SyncBackendHostCore> core_;
|
|
|
| // A handle referencing the main interface for non-blocking sync types.
|
| - scoped_ptr<syncer::SyncCoreProxy> sync_core_proxy_;
|
| + scoped_ptr<syncer::SyncContextProxy> sync_context_proxy_;
|
|
|
| bool initialized_;
|
|
|
|
|