Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Side by Side Diff: ios/chrome/browser/sync/ios_chrome_profile_sync_test_util.cc

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_test_util.h" 5 #include "ios/chrome/browser/sync/ios_chrome_profile_sync_test_util.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/ptr_util.h"
8 #include "components/browser_sync/browser/profile_sync_service_mock.h" 9 #include "components/browser_sync/browser/profile_sync_service_mock.h"
9 #include "components/browser_sync/browser/profile_sync_test_util.h" 10 #include "components/browser_sync/browser/profile_sync_test_util.h"
10 #include "components/signin/core/browser/profile_oauth2_token_service.h" 11 #include "components/signin/core/browser/profile_oauth2_token_service.h"
11 #include "components/signin/core/browser/signin_manager.h" 12 #include "components/signin/core/browser/signin_manager.h"
12 #include "components/sync_driver/signin_manager_wrapper.h" 13 #include "components/sync_driver/signin_manager_wrapper.h"
13 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" 14 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
14 #include "ios/chrome/browser/signin/oauth2_token_service_factory.h" 15 #include "ios/chrome/browser/signin/oauth2_token_service_factory.h"
15 #include "ios/chrome/browser/signin/signin_manager_factory.h" 16 #include "ios/chrome/browser/signin/signin_manager_factory.h"
16 #include "ios/chrome/browser/sync/ios_chrome_sync_client.h" 17 #include "ios/chrome/browser/sync/ios_chrome_sync_client.h"
17 #include "ios/chrome/common/channel_info.h" 18 #include "ios/chrome/common/channel_info.h"
18 #include "ios/web/public/web_thread.h" 19 #include "ios/web/public/web_thread.h"
19 20
20 ProfileSyncService::InitParams CreateProfileSyncServiceParamsForTest( 21 ProfileSyncService::InitParams CreateProfileSyncServiceParamsForTest(
21 scoped_ptr<sync_driver::SyncClient> sync_client, 22 std::unique_ptr<sync_driver::SyncClient> sync_client,
22 ios::ChromeBrowserState* browser_state) { 23 ios::ChromeBrowserState* browser_state) {
23 ProfileSyncService::InitParams init_params; 24 ProfileSyncService::InitParams init_params;
24 25
25 init_params.signin_wrapper = make_scoped_ptr(new SigninManagerWrapper( 26 init_params.signin_wrapper = base::WrapUnique(new SigninManagerWrapper(
26 ios::SigninManagerFactory::GetForBrowserState(browser_state))); 27 ios::SigninManagerFactory::GetForBrowserState(browser_state)));
27 init_params.oauth2_token_service = 28 init_params.oauth2_token_service =
28 OAuth2TokenServiceFactory::GetForBrowserState(browser_state); 29 OAuth2TokenServiceFactory::GetForBrowserState(browser_state);
29 init_params.start_behavior = ProfileSyncService::MANUAL_START; 30 init_params.start_behavior = ProfileSyncService::MANUAL_START;
30 init_params.sync_client = 31 init_params.sync_client =
31 sync_client ? std::move(sync_client) 32 sync_client ? std::move(sync_client)
32 : make_scoped_ptr(new IOSChromeSyncClient(browser_state)); 33 : base::WrapUnique(new IOSChromeSyncClient(browser_state));
33 init_params.network_time_update_callback = 34 init_params.network_time_update_callback =
34 base::Bind(&browser_sync::EmptyNetworkTimeUpdate); 35 base::Bind(&browser_sync::EmptyNetworkTimeUpdate);
35 init_params.base_directory = browser_state->GetStatePath(); 36 init_params.base_directory = browser_state->GetStatePath();
36 init_params.url_request_context = browser_state->GetRequestContext(); 37 init_params.url_request_context = browser_state->GetRequestContext();
37 init_params.debug_identifier = browser_state->GetDebugName(); 38 init_params.debug_identifier = browser_state->GetDebugName();
38 init_params.channel = ::GetChannel(); 39 init_params.channel = ::GetChannel();
39 init_params.db_thread = 40 init_params.db_thread =
40 web::WebThread::GetTaskRunnerForThread(web::WebThread::DB); 41 web::WebThread::GetTaskRunnerForThread(web::WebThread::DB);
41 init_params.file_thread = 42 init_params.file_thread =
42 web::WebThread::GetTaskRunnerForThread(web::WebThread::FILE); 43 web::WebThread::GetTaskRunnerForThread(web::WebThread::FILE);
43 init_params.blocking_pool = web::WebThread::GetBlockingPool(); 44 init_params.blocking_pool = web::WebThread::GetBlockingPool();
44 45
45 return init_params; 46 return init_params;
46 } 47 }
47 48
48 scoped_ptr<KeyedService> BuildMockProfileSyncService( 49 std::unique_ptr<KeyedService> BuildMockProfileSyncService(
49 web::BrowserState* context) { 50 web::BrowserState* context) {
50 return make_scoped_ptr( 51 return base::WrapUnique(
51 new ProfileSyncServiceMock(CreateProfileSyncServiceParamsForTest( 52 new ProfileSyncServiceMock(CreateProfileSyncServiceParamsForTest(
52 nullptr, ios::ChromeBrowserState::FromBrowserState(context)))); 53 nullptr, ios::ChromeBrowserState::FromBrowserState(context))));
53 } 54 }
OLDNEW
« no previous file with comments | « ios/chrome/browser/sync/ios_chrome_profile_sync_test_util.h ('k') | ios/chrome/browser/sync/ios_chrome_sync_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698