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

Unified Diff: chrome/browser/sync/sync_ui_util_unittest.cc

Issue 2388163002: [Sync] Move //components/sync to the syncer namespace, take 2. (Closed)
Patch Set: Rebase. Created 4 years, 2 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
« no previous file with comments | « chrome/browser/sync/sync_ui_util.cc ('k') | chrome/browser/sync/test/integration/enable_disable_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/sync_ui_util_unittest.cc
diff --git a/chrome/browser/sync/sync_ui_util_unittest.cc b/chrome/browser/sync/sync_ui_util_unittest.cc
index 8ee8e2fd2d5989396e88e123a4a41519853de7f1..8a66eaa3a116531ff89b7e68a7a5df89cf2a9e68 100644
--- a/chrome/browser/sync/sync_ui_util_unittest.cc
+++ b/chrome/browser/sync/sync_ui_util_unittest.cc
@@ -93,7 +93,7 @@ TEST_F(SyncUIUtilTest, PassphraseGlobalError) {
std::unique_ptr<Profile> profile = MakeSignedInTestingProfile();
ProfileSyncServiceMock service(
CreateProfileSyncServiceParamsForTest(profile.get()));
- browser_sync::SyncBackendHost::Status status;
+ syncer::SyncBackendHost::Status status;
EXPECT_CALL(service, QueryDetailedSyncStatus(_))
.WillRepeatedly(Return(false));
EXPECT_CALL(service, IsPassphraseRequired())
@@ -113,7 +113,7 @@ TEST_F(SyncUIUtilTest, AuthAndPassphraseGlobalError) {
std::unique_ptr<Profile> profile(MakeSignedInTestingProfile());
ProfileSyncServiceMock service(
CreateProfileSyncServiceParamsForTest(profile.get()));
- browser_sync::SyncBackendHost::Status status;
+ syncer::SyncBackendHost::Status status;
EXPECT_CALL(service, QueryDetailedSyncStatus(_))
.WillRepeatedly(Return(false));
@@ -143,7 +143,7 @@ TEST_F(SyncUIUtilTest, AuthStateGlobalError) {
CreateProfileSyncServiceParamsForTest(profile.get());
NiceMock<ProfileSyncServiceMock> service(&init_params);
- browser_sync::SyncBackendHost::Status status;
+ syncer::SyncBackendHost::Status status;
EXPECT_CALL(service, QueryDetailedSyncStatus(_))
.WillRepeatedly(Return(false));
@@ -218,7 +218,7 @@ void GetDistinctCase(ProfileSyncServiceMock* service,
.WillRepeatedly(Return(false));
EXPECT_CALL(*service, IsFirstSetupInProgress())
.WillRepeatedly(Return(true));
- browser_sync::SyncBackendHost::Status status;
+ syncer::SyncBackendHost::Status status;
EXPECT_CALL(*service, QueryDetailedSyncStatus(_))
.WillRepeatedly(DoAll(SetArgPointee<0>(status), Return(false)));
return;
@@ -230,7 +230,7 @@ void GetDistinctCase(ProfileSyncServiceMock* service,
.WillRepeatedly(Return(false));
EXPECT_CALL(*service, HasUnrecoverableError())
.WillRepeatedly(Return(true));
- browser_sync::SyncBackendHost::Status status;
+ syncer::SyncBackendHost::Status status;
EXPECT_CALL(*service, QueryDetailedSyncStatus(_))
.WillRepeatedly(DoAll(SetArgPointee<0>(status), Return(false)));
return;
@@ -241,7 +241,7 @@ void GetDistinctCase(ProfileSyncServiceMock* service,
EXPECT_CALL(*service, IsSyncActive()).WillRepeatedly(Return(true));
EXPECT_CALL(*service, IsPassphraseRequired())
.WillRepeatedly(Return(false));
- browser_sync::SyncBackendHost::Status status;
+ syncer::SyncBackendHost::Status status;
EXPECT_CALL(*service, QueryDetailedSyncStatus(_))
.WillRepeatedly(DoAll(SetArgPointee<0>(status), Return(false)));
EXPECT_CALL(*service, HasUnrecoverableError())
@@ -255,7 +255,7 @@ void GetDistinctCase(ProfileSyncServiceMock* service,
EXPECT_CALL(*service, IsSyncActive()).WillRepeatedly(Return(true));
EXPECT_CALL(*service, IsPassphraseRequired())
.WillRepeatedly(Return(false));
- browser_sync::SyncBackendHost::Status status;
+ syncer::SyncBackendHost::Status status;
EXPECT_CALL(*service, QueryDetailedSyncStatus(_))
.WillRepeatedly(DoAll(SetArgPointee<0>(status), Return(false)));
provider->SetAuthError(
@@ -273,7 +273,7 @@ void GetDistinctCase(ProfileSyncServiceMock* service,
.WillRepeatedly(Return(false));
syncer::SyncProtocolError protocolError;
protocolError.action = syncer::STOP_AND_RESTART_SYNC;
- browser_sync::SyncBackendHost::Status status;
+ syncer::SyncBackendHost::Status status;
status.sync_protocol_error = protocolError;
EXPECT_CALL(*service, QueryDetailedSyncStatus(_))
.WillRepeatedly(DoAll(SetArgPointee<0>(status), Return(false)));
@@ -285,7 +285,7 @@ void GetDistinctCase(ProfileSyncServiceMock* service,
EXPECT_CALL(*service, IsFirstSetupComplete())
.WillRepeatedly(Return(true));
EXPECT_CALL(*service, IsSyncActive()).WillRepeatedly(Return(true));
- browser_sync::SyncBackendHost::Status status;
+ syncer::SyncBackendHost::Status status;
EXPECT_CALL(*service, QueryDetailedSyncStatus(_))
.WillRepeatedly(DoAll(SetArgPointee<0>(status), Return(false)));
EXPECT_CALL(*service, HasUnrecoverableError())
@@ -302,7 +302,7 @@ void GetDistinctCase(ProfileSyncServiceMock* service,
EXPECT_CALL(*service, IsSyncActive()).WillRepeatedly(Return(true));
EXPECT_CALL(*service, IsPassphraseRequired())
.WillRepeatedly(Return(false));
- browser_sync::SyncBackendHost::Status status;
+ syncer::SyncBackendHost::Status status;
EXPECT_CALL(*service, QueryDetailedSyncStatus(_))
.WillRepeatedly(DoAll(SetArgPointee<0>(status), Return(false)));
EXPECT_CALL(*service, HasUnrecoverableError())
@@ -318,7 +318,7 @@ void GetDistinctCase(ProfileSyncServiceMock* service,
EXPECT_CALL(*service, IsSyncActive()).WillRepeatedly(Return(false));
EXPECT_CALL(*service, IsPassphraseRequired())
.WillRepeatedly(Return(false));
- browser_sync::SyncBackendHost::Status status;
+ syncer::SyncBackendHost::Status status;
EXPECT_CALL(*service, QueryDetailedSyncStatus(_))
.WillRepeatedly(DoAll(SetArgPointee<0>(status), Return(false)));
EXPECT_CALL(*service, HasUnrecoverableError())
« no previous file with comments | « chrome/browser/sync/sync_ui_util.cc ('k') | chrome/browser/sync/test/integration/enable_disable_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698