Chromium Code Reviews| Index: chrome/browser/sync/profile_sync_service.cc |
| diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc |
| index e0c710892492553d70c6b1c9997c728bf06b4a6f..70a17949f87889e05595fa0b440d2c3860851676 100644 |
| --- a/chrome/browser/sync/profile_sync_service.cc |
| +++ b/chrome/browser/sync/profile_sync_service.cc |
| @@ -85,7 +85,7 @@ |
| #include "sync/internal_api/public/http_bridge_network_resources.h" |
| #include "sync/internal_api/public/network_resources.h" |
| #include "sync/internal_api/public/sessions/type_debug_info_observer.h" |
| -#include "sync/internal_api/public/sync_core_proxy.h" |
| +#include "sync/internal_api/public/sync_context_proxy.h" |
| #include "sync/internal_api/public/sync_encryption_handler.h" |
| #include "sync/internal_api/public/util/experiments.h" |
| #include "sync/internal_api/public/util/sync_string_conversions.h" |
| @@ -398,11 +398,9 @@ void ProfileSyncService::RegisterNonBlockingType(syncer::ModelType type) { |
| void ProfileSyncService::InitializeNonBlockingType( |
| syncer::ModelType type, |
| scoped_refptr<base::SequencedTaskRunner> task_runner, |
| - base::WeakPtr<syncer::NonBlockingTypeProcessor> processor) { |
| - non_blocking_data_type_manager_.InitializeTypeProcessor( |
| - type, |
| - task_runner, |
| - processor); |
| + base::WeakPtr<syncer::ModelTypeSyncProxyImpl> type_sync_proxy) { |
| + non_blocking_data_type_manager_.InitializeTypeSyncProxy( |
|
stanisc
2014/06/24 21:59:01
Should non_blocking_data_type_manager_ be renamed
rlarocque
2014/06/24 23:08:32
We decided against renaming NonBlockingDataTypeCon
|
| + type, task_runner, type_sync_proxy); |
| } |
| bool ProfileSyncService::IsSessionsDataTypeControllerRunning() const { |
| @@ -1016,7 +1014,7 @@ void ProfileSyncService::PostBackendInitialization() { |
| } |
| non_blocking_data_type_manager_.ConnectSyncBackend( |
| - backend_->GetSyncCoreProxy()); |
| + backend_->GetSyncContextProxy()); |
| if (type_debug_info_observers_.might_have_observers()) { |
| backend_->EnableDirectoryTypeDebugInfoForwarding(); |