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

Unified Diff: ios/chrome/browser/sync/ios_chrome_profile_sync_test_util.cc

Issue 2354613002: [Sync] Fix namespaces for the browser_sync component. (Closed)
Patch Set: Address comments. Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/sync/ios_chrome_profile_sync_test_util.cc
diff --git a/ios/chrome/browser/sync/ios_chrome_profile_sync_test_util.cc b/ios/chrome/browser/sync/ios_chrome_profile_sync_test_util.cc
index 6ca965138d3dba2a9dcc055d3498a3c7a08e64ad..35c9e1fe63694c3432c3725b7966d39bf2fc5620 100644
--- a/ios/chrome/browser/sync/ios_chrome_profile_sync_test_util.cc
+++ b/ios/chrome/browser/sync/ios_chrome_profile_sync_test_util.cc
@@ -18,16 +18,17 @@
#include "ios/chrome/common/channel_info.h"
#include "ios/web/public/web_thread.h"
-ProfileSyncService::InitParams CreateProfileSyncServiceParamsForTest(
+browser_sync::ProfileSyncService::InitParams
+CreateProfileSyncServiceParamsForTest(
std::unique_ptr<sync_driver::SyncClient> sync_client,
ios::ChromeBrowserState* browser_state) {
- ProfileSyncService::InitParams init_params;
+ browser_sync::ProfileSyncService::InitParams init_params;
init_params.signin_wrapper = base::MakeUnique<SigninManagerWrapper>(
ios::SigninManagerFactory::GetForBrowserState(browser_state));
init_params.oauth2_token_service =
OAuth2TokenServiceFactory::GetForBrowserState(browser_state);
- init_params.start_behavior = ProfileSyncService::MANUAL_START;
+ init_params.start_behavior = browser_sync::ProfileSyncService::MANUAL_START;
init_params.sync_client =
sync_client ? std::move(sync_client)
: base::MakeUnique<IOSChromeSyncClient>(browser_state);
@@ -48,7 +49,7 @@ ProfileSyncService::InitParams CreateProfileSyncServiceParamsForTest(
std::unique_ptr<KeyedService> BuildMockProfileSyncService(
web::BrowserState* context) {
- return base::MakeUnique<ProfileSyncServiceMock>(
+ return base::MakeUnique<browser_sync::ProfileSyncServiceMock>(
CreateProfileSyncServiceParamsForTest(
nullptr, ios::ChromeBrowserState::FromBrowserState(context)));
}
« 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.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698