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

Unified Diff: chrome/browser/ui/passwords/manage_passwords_view_utils_desktop_unittest.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: chrome/browser/ui/passwords/manage_passwords_view_utils_desktop_unittest.cc
diff --git a/chrome/browser/ui/passwords/manage_passwords_view_utils_desktop_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_view_utils_desktop_unittest.cc
index 728c470af694f158b86c8dc0932b1c739a7977b0..98281584a5e73b9ec2d82c255df331686cc0a354 100644
--- a/chrome/browser/ui/passwords/manage_passwords_view_utils_desktop_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_view_utils_desktop_unittest.cc
@@ -70,9 +70,10 @@ class ManagePasswordsViewUtilDesktopTest : public testing::Test {
base::FieldTrialList::CreateFieldTrial(kBrandingExperimentName, name);
}
- ProfileSyncService* GetSyncServiceForSmartLockUser() {
- ProfileSyncServiceMock* sync_service = static_cast<ProfileSyncServiceMock*>(
- ProfileSyncServiceFactory::GetInstance()->GetForProfile(&profile_));
+ browser_sync::ProfileSyncService* GetSyncServiceForSmartLockUser() {
+ browser_sync::ProfileSyncServiceMock* sync_service =
+ static_cast<browser_sync::ProfileSyncServiceMock*>(
+ ProfileSyncServiceFactory::GetInstance()->GetForProfile(&profile_));
EXPECT_CALL(*sync_service, IsSyncActive()).WillRepeatedly(Return(true));
EXPECT_CALL(*sync_service, IsFirstSetupComplete())
.WillRepeatedly(Return(true));
@@ -83,9 +84,10 @@ class ManagePasswordsViewUtilDesktopTest : public testing::Test {
return sync_service;
}
- ProfileSyncService* GetSyncServiceForNonSmartLockUser() {
- ProfileSyncServiceMock* sync_service = static_cast<ProfileSyncServiceMock*>(
- ProfileSyncServiceFactory::GetInstance()->GetForProfile(&profile_));
+ browser_sync::ProfileSyncService* GetSyncServiceForNonSmartLockUser() {
+ browser_sync::ProfileSyncServiceMock* sync_service =
+ static_cast<browser_sync::ProfileSyncServiceMock*>(
+ ProfileSyncServiceFactory::GetInstance()->GetForProfile(&profile_));
EXPECT_CALL(*sync_service, IsSyncActive()).WillRepeatedly(Return(false));
return sync_service;
}
@@ -152,7 +154,7 @@ TEST_F(ManagePasswordsViewUtilDesktopTest, GetPasswordManagerSettingsStringId) {
for (const auto& test_case : kTestData) {
base::FieldTrialList field_trial_list(new base::MockEntropyProvider());
SCOPED_TRACE(testing::Message(test_case.description));
- ProfileSyncService* sync_service;
+ browser_sync::ProfileSyncService* sync_service;
if (test_case.user_type == SMART_LOCK_USER)
sync_service = GetSyncServiceForSmartLockUser();
else

Powered by Google App Engine
This is Rietveld 408576698