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

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

Issue 12502017: signin: pull basic SigninManager functionality into new SigninManagerBase class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix override Created 7 years, 9 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/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 09367d1d3c07c8462443f76d050941cdd0f4a5d4..b7b2d4e876dbb545501ab6e53dce5a7cc66bca4b 100644
--- a/chrome/browser/sync/sync_ui_util_unittest.cc
+++ b/chrome/browser/sync/sync_ui_util_unittest.cc
@@ -45,7 +45,7 @@ namespace {
// Utility function to test that GetStatusLabelsForSyncGlobalError returns
// the correct results for the given states.
void VerifySyncGlobalErrorResult(NiceMock<ProfileSyncServiceMock>* service,
- const SigninManager& signin,
+ const SigninManagerBase& signin,
GoogleServiceAuthError::State error_state,
bool is_signed_in,
bool is_error) {
@@ -74,7 +74,7 @@ TEST(SyncUIUtilTest, PassphraseGlobalError) {
scoped_ptr<Profile> profile(
ProfileSyncServiceMock::MakeSignedInTestingProfile());
NiceMock<ProfileSyncServiceMock> service(profile.get());
- FakeSigninManager signin(profile.get());
+ FakeSigninManagerBase signin(profile.get());
browser_sync::SyncBackendHost::Status status;
EXPECT_CALL(service, QueryDetailedSyncStatus(_))
.WillRepeatedly(Return(false));
@@ -94,7 +94,7 @@ TEST(SyncUIUtilTest, AuthAndPassphraseGlobalError) {
scoped_ptr<Profile> profile(
ProfileSyncServiceMock::MakeSignedInTestingProfile());
NiceMock<ProfileSyncServiceMock> service(profile.get());
- FakeSigninManager signin(profile.get());
+ FakeSigninManagerBase signin(profile.get());
browser_sync::SyncBackendHost::Status status;
EXPECT_CALL(service, QueryDetailedSyncStatus(_))
.WillRepeatedly(Return(false));
@@ -145,7 +145,7 @@ TEST(SyncUIUtilTest, AuthStateGlobalError) {
GoogleServiceAuthError::HOSTED_NOT_ALLOWED
};
- FakeSigninManager signin(profile.get());
+ FakeSigninManagerBase signin(profile.get());
for (size_t i = 0; i < arraysize(table); ++i) {
VerifySyncGlobalErrorResult(&service, signin, table[i], true, false);
VerifySyncGlobalErrorResult(&service, signin, table[i], false, false);
@@ -154,7 +154,7 @@ TEST(SyncUIUtilTest, AuthStateGlobalError) {
// Loads a ProfileSyncServiceMock to emulate one of a number of distinct cases
// in order to perform tests on the generated messages.
void GetDistinctCase(ProfileSyncServiceMock& service,
- FakeSigninManager* signin,
+ FakeSigninManagerBase* signin,
FakeAuthStatusProvider* provider,
int caseNumber) {
// Auth Error object is returned by reference in mock and needs to stay in
@@ -294,7 +294,7 @@ TEST(SyncUIUtilTest, DistinctCasesReportUniqueMessageSets) {
scoped_ptr<Profile> profile(
ProfileSyncServiceMock::MakeSignedInTestingProfile());
ProfileSyncServiceMock service(profile.get());
- FakeSigninManager signin(profile.get());
+ FakeSigninManagerBase signin(profile.get());
signin.SetAuthenticatedUsername("test_user@test.com");
FakeAuthStatusProvider provider(signin.signin_global_error());
GetDistinctCase(service, &signin, &provider, idx);
@@ -327,7 +327,7 @@ TEST(SyncUIUtilTest, HtmlNotIncludedInStatusIfNotRequested) {
scoped_ptr<Profile> profile(
ProfileSyncServiceMock::MakeSignedInTestingProfile());
ProfileSyncServiceMock service(profile.get());
- FakeSigninManager signin(profile.get());
+ FakeSigninManagerBase signin(profile.get());
signin.SetAuthenticatedUsername("test_user@test.com");
FakeAuthStatusProvider provider(signin.signin_global_error());
GetDistinctCase(service, &signin, &provider, idx);

Powered by Google App Engine
This is Rietveld 408576698