Chromium Code Reviews| Index: chrome/browser/sync/glue/sync_backend_host_impl.cc |
| diff --git a/chrome/browser/sync/glue/sync_backend_host_impl.cc b/chrome/browser/sync/glue/sync_backend_host_impl.cc |
| index 5f38753fb27021e2d81d6930c1a4f9f1c3c45cf2..dc0de63237f7dc4872aca1018e7b95145a3bc8db 100644 |
| --- a/chrome/browser/sync/glue/sync_backend_host_impl.cc |
| +++ b/chrome/browser/sync/glue/sync_backend_host_impl.cc |
| @@ -256,7 +256,7 @@ void SyncBackendHostImpl::StopSyncingForShutdown() { |
| notification_registrar_.RemoveAll(); |
| // Stop non-blocking sync types from sending any more requests to the syncer. |
| - sync_core_proxy_.reset(); |
| + sync_context_proxy_.reset(); |
| DCHECK(registrar_->sync_thread()->IsRunning()); |
| @@ -459,10 +459,11 @@ syncer::UserShare* SyncBackendHostImpl::GetUserShare() const { |
| return core_->sync_manager()->GetUserShare(); |
| } |
| -scoped_ptr<syncer::SyncCoreProxy> SyncBackendHostImpl::GetSyncCoreProxy() { |
| - return sync_core_proxy_.get() ? |
| - scoped_ptr<syncer::SyncCoreProxy>(sync_core_proxy_->Clone()) : |
| - scoped_ptr<syncer::SyncCoreProxy>(); |
| +scoped_ptr<syncer::SyncContextProxy> |
| +SyncBackendHostImpl::GetSyncContextProxy() { |
| + return sync_context_proxy_.get() ? scoped_ptr<syncer::SyncContextProxy>( |
| + sync_context_proxy_->Clone()) |
| + : scoped_ptr<syncer::SyncContextProxy>(); |
| } |
| SyncBackendHostImpl::Status SyncBackendHostImpl::GetDetailedStatus() { |
| @@ -645,11 +646,11 @@ void SyncBackendHostImpl::HandleInitializationSuccessOnFrontendLoop( |
| const syncer::WeakHandle<syncer::JsBackend> js_backend, |
| const syncer::WeakHandle<syncer::DataTypeDebugInfoListener> |
| debug_info_listener, |
| - syncer::SyncCoreProxy* sync_core_proxy) { |
| + syncer::SyncContextProxy* sync_context_proxy) { |
| DCHECK_EQ(base::MessageLoop::current(), frontend_loop_); |
| - if (sync_core_proxy) |
| - sync_core_proxy_ = sync_core_proxy->Clone(); |
| + if (sync_context_proxy) |
| + sync_context_proxy_ = sync_context_proxy->Clone(); |
|
stanisc
2014/06/24 21:59:00
Preexisting: should sync_context_proxy be cloned i
rlarocque
2014/06/24 23:08:32
True, these lines should be moved below the fronte
|
| if (!frontend_) |
| return; |