| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ios/chrome/browser/sync/ios_chrome_profile_sync_service_factory.h" | 5 #include "ios/chrome/browser/sync/ios_chrome_profile_sync_service_factory.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "base/memory/singleton.h" | 10 #include "base/memory/singleton.h" |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 // Always create the GCMProfileService instance such that we can listen to | 121 // Always create the GCMProfileService instance such that we can listen to |
| 122 // the profile notifications and purge the GCM store when the profile is | 122 // the profile notifications and purge the GCM store when the profile is |
| 123 // being signed out. | 123 // being signed out. |
| 124 IOSChromeGCMProfileServiceFactory::GetForBrowserState(browser_state); | 124 IOSChromeGCMProfileServiceFactory::GetForBrowserState(browser_state); |
| 125 | 125 |
| 126 // TODO(crbug.com/171406): Change AboutSigninInternalsFactory to load on | 126 // TODO(crbug.com/171406): Change AboutSigninInternalsFactory to load on |
| 127 // startup once bug has been fixed. | 127 // startup once bug has been fixed. |
| 128 ios::AboutSigninInternalsFactory::GetForBrowserState(browser_state); | 128 ios::AboutSigninInternalsFactory::GetForBrowserState(browser_state); |
| 129 | 129 |
| 130 ProfileSyncService::InitParams init_params; | 130 ProfileSyncService::InitParams init_params; |
| 131 init_params.signin_wrapper = | 131 init_params.signin_wrapper = base::MakeUnique<SigninManagerWrapper>(signin); |
| 132 base::WrapUnique(new SigninManagerWrapper(signin)); | |
| 133 init_params.oauth2_token_service = | 132 init_params.oauth2_token_service = |
| 134 OAuth2TokenServiceFactory::GetForBrowserState(browser_state); | 133 OAuth2TokenServiceFactory::GetForBrowserState(browser_state); |
| 135 init_params.start_behavior = ProfileSyncService::MANUAL_START; | 134 init_params.start_behavior = ProfileSyncService::MANUAL_START; |
| 136 init_params.sync_client = | 135 init_params.sync_client = |
| 137 base::WrapUnique(new IOSChromeSyncClient(browser_state)); | 136 base::MakeUnique<IOSChromeSyncClient>(browser_state); |
| 138 init_params.network_time_update_callback = base::Bind(&UpdateNetworkTime); | 137 init_params.network_time_update_callback = base::Bind(&UpdateNetworkTime); |
| 139 init_params.base_directory = browser_state->GetStatePath(); | 138 init_params.base_directory = browser_state->GetStatePath(); |
| 140 init_params.url_request_context = browser_state->GetRequestContext(); | 139 init_params.url_request_context = browser_state->GetRequestContext(); |
| 141 init_params.debug_identifier = browser_state->GetDebugName(); | 140 init_params.debug_identifier = browser_state->GetDebugName(); |
| 142 init_params.channel = ::GetChannel(); | 141 init_params.channel = ::GetChannel(); |
| 143 init_params.db_thread = | 142 init_params.db_thread = |
| 144 web::WebThread::GetTaskRunnerForThread(web::WebThread::DB); | 143 web::WebThread::GetTaskRunnerForThread(web::WebThread::DB); |
| 145 init_params.file_thread = | 144 init_params.file_thread = |
| 146 web::WebThread::GetTaskRunnerForThread(web::WebThread::FILE); | 145 web::WebThread::GetTaskRunnerForThread(web::WebThread::FILE); |
| 147 init_params.blocking_pool = web::WebThread::GetBlockingPool(); | 146 init_params.blocking_pool = web::WebThread::GetBlockingPool(); |
| 148 | 147 |
| 149 auto pss = base::WrapUnique(new ProfileSyncService(std::move(init_params))); | 148 auto pss = base::MakeUnique<ProfileSyncService>(std::move(init_params)); |
| 150 | 149 |
| 151 // Will also initialize the sync client. | 150 // Will also initialize the sync client. |
| 152 pss->Initialize(); | 151 pss->Initialize(); |
| 153 return std::move(pss); | 152 return std::move(pss); |
| 154 } | 153 } |
| OLD | NEW |