| Index: sync/internal_api/sync_context_proxy_impl.cc
|
| diff --git a/sync/internal_api/sync_context_proxy_impl.cc b/sync/internal_api/sync_context_proxy_impl.cc
|
| index 9d8c290bc2a2959b4c608e6dad095eaa3f6d011c..19b13b7640f34976a1791f09c1d890f49c9c58be 100644
|
| --- a/sync/internal_api/sync_context_proxy_impl.cc
|
| +++ b/sync/internal_api/sync_context_proxy_impl.cc
|
| @@ -7,7 +7,6 @@
|
| #include "base/bind.h"
|
| #include "base/location.h"
|
| #include "base/single_thread_task_runner.h"
|
| -#include "base/thread_task_runner_handle.h"
|
| #include "sync/internal_api/public/non_blocking_sync_common.h"
|
| #include "sync/internal_api/public/sync_context.h"
|
|
|
| @@ -24,18 +23,12 @@ SyncContextProxyImpl::~SyncContextProxyImpl() {
|
|
|
| void SyncContextProxyImpl::ConnectTypeToSync(
|
| syncer::ModelType type,
|
| - const DataTypeState& data_type_state,
|
| - const UpdateResponseDataList& saved_pending_updates,
|
| - const base::WeakPtr<ModelTypeProcessor>& type_processor) {
|
| + scoped_ptr<ActivationContext> activation_context) {
|
| VLOG(1) << "ConnectTypeToSync: " << ModelTypeToString(type);
|
| - sync_task_runner_->PostTask(FROM_HERE,
|
| - base::Bind(&SyncContext::ConnectSyncTypeToWorker,
|
| - sync_context_,
|
| - type,
|
| - data_type_state,
|
| - saved_pending_updates,
|
| - base::ThreadTaskRunnerHandle::Get(),
|
| - type_processor));
|
| + sync_task_runner_->PostTask(
|
| + FROM_HERE,
|
| + base::Bind(&SyncContext::ConnectSyncTypeToWorker, sync_context_, type,
|
| + base::Passed(&activation_context)));
|
| }
|
|
|
| void SyncContextProxyImpl::Disconnect(syncer::ModelType type) {
|
|
|