Index: chrome/browser/ui/webui/settings/people_handler_unittest.cc |
diff --git a/chrome/browser/ui/webui/settings/people_handler_unittest.cc b/chrome/browser/ui/webui/settings/people_handler_unittest.cc |
index 7a8d1ee6521953404f968f2698165219bc6a1525..1b2e26d1bf6c0e9c9e94736cb7190ff9230986de 100644 |
--- a/chrome/browser/ui/webui/settings/people_handler_unittest.cc |
+++ b/chrome/browser/ui/webui/settings/people_handler_unittest.cc |
@@ -302,8 +302,6 @@ TEST_F(PeopleHandlerTest, Basic) { |
#if !defined(OS_CHROMEOS) |
TEST_F(PeopleHandlerFirstSigninTest, DisplayBasicLogin) { |
EXPECT_CALL(*mock_pss_, CanSyncStart()).WillRepeatedly(Return(false)); |
- EXPECT_CALL(*mock_pss_, IsOAuthRefreshTokenAvailable()) |
- .WillRepeatedly(Return(false)); |
EXPECT_CALL(*mock_pss_, HasSyncSetupCompleted()) |
.WillRepeatedly(Return(false)); |
// Ensure that the user is not signed in before calling |HandleStartSignin()|. |
@@ -326,8 +324,6 @@ TEST_F(PeopleHandlerFirstSigninTest, DisplayBasicLogin) { |
TEST_F(PeopleHandlerTest, ShowSyncSetupWhenNotSignedIn) { |
EXPECT_CALL(*mock_pss_, CanSyncStart()).WillRepeatedly(Return(false)); |
- EXPECT_CALL(*mock_pss_, IsOAuthRefreshTokenAvailable()) |
- .WillRepeatedly(Return(false)); |
EXPECT_CALL(*mock_pss_, HasSyncSetupCompleted()) |
.WillRepeatedly(Return(false)); |
handler_->HandleShowSetupUI(NULL); |
@@ -361,8 +357,6 @@ TEST_F(PeopleHandlerTest, HandleSetupUIWhenSyncDisabled) { |
// it is displaying the spinner to the user. |
TEST_F(PeopleHandlerTest, DisplayConfigureWithBackendDisabledAndCancel) { |
EXPECT_CALL(*mock_pss_, CanSyncStart()).WillRepeatedly(Return(true)); |
- EXPECT_CALL(*mock_pss_, IsOAuthRefreshTokenAvailable()) |
- .WillRepeatedly(Return(true)); |
EXPECT_CALL(*mock_pss_, HasSyncSetupCompleted()) |
.WillRepeatedly(Return(false)); |
error_ = GoogleServiceAuthError::AuthErrorNone(); |
@@ -387,8 +381,6 @@ TEST_F(PeopleHandlerTest, DisplayConfigureWithBackendDisabledAndCancel) { |
TEST_F(PeopleHandlerTest, |
DisplayConfigureWithBackendDisabledAndSyncStartupCompleted) { |
EXPECT_CALL(*mock_pss_, CanSyncStart()).WillRepeatedly(Return(true)); |
- EXPECT_CALL(*mock_pss_, IsOAuthRefreshTokenAvailable()) |
- .WillRepeatedly(Return(true)); |
EXPECT_CALL(*mock_pss_, HasSyncSetupCompleted()) |
.WillRepeatedly(Return(false)); |
error_ = GoogleServiceAuthError::AuthErrorNone(); |
@@ -438,8 +430,6 @@ TEST_F(PeopleHandlerTest, |
TEST_F(PeopleHandlerTest, |
DisplayConfigureWithBackendDisabledAndCancelAfterSigninSuccess) { |
EXPECT_CALL(*mock_pss_, CanSyncStart()).WillRepeatedly(Return(true)); |
- EXPECT_CALL(*mock_pss_, IsOAuthRefreshTokenAvailable()) |
- .WillRepeatedly(Return(true)); |
EXPECT_CALL(*mock_pss_, HasSyncSetupCompleted()) |
.WillRepeatedly(Return(false)); |
error_ = GoogleServiceAuthError::AuthErrorNone(); |
@@ -464,8 +454,6 @@ TEST_F(PeopleHandlerTest, |
TEST_F(PeopleHandlerTest, |
DisplayConfigureWithBackendDisabledAndSigninFailed) { |
EXPECT_CALL(*mock_pss_, CanSyncStart()).WillRepeatedly(Return(true)); |
- EXPECT_CALL(*mock_pss_, IsOAuthRefreshTokenAvailable()) |
- .WillRepeatedly(Return(true)); |
EXPECT_CALL(*mock_pss_, HasSyncSetupCompleted()) |
.WillRepeatedly(Return(false)); |
error_ = GoogleServiceAuthError::AuthErrorNone(); |
@@ -498,8 +486,6 @@ class PeopleHandlerNonCrosTest : public PeopleHandlerTest { |
TEST_F(PeopleHandlerNonCrosTest, HandleGaiaAuthFailure) { |
EXPECT_CALL(*mock_pss_, CanSyncStart()).WillRepeatedly(Return(false)); |
- EXPECT_CALL(*mock_pss_, IsOAuthRefreshTokenAvailable()) |
- .WillRepeatedly(Return(false)); |
EXPECT_CALL(*mock_pss_, HasUnrecoverableError()) |
.WillRepeatedly(Return(false)); |
EXPECT_CALL(*mock_pss_, HasSyncSetupCompleted()) |
@@ -513,8 +499,6 @@ TEST_F(PeopleHandlerNonCrosTest, HandleGaiaAuthFailure) { |
// TODO(kochi): We need equivalent tests for ChromeOS. |
TEST_F(PeopleHandlerNonCrosTest, UnrecoverableErrorInitializingSync) { |
EXPECT_CALL(*mock_pss_, CanSyncStart()).WillRepeatedly(Return(false)); |
- EXPECT_CALL(*mock_pss_, IsOAuthRefreshTokenAvailable()) |
- .WillRepeatedly(Return(false)); |
EXPECT_CALL(*mock_pss_, HasSyncSetupCompleted()) |
.WillRepeatedly(Return(false)); |
// Open the web UI. |
@@ -525,8 +509,6 @@ TEST_F(PeopleHandlerNonCrosTest, UnrecoverableErrorInitializingSync) { |
TEST_F(PeopleHandlerNonCrosTest, GaiaErrorInitializingSync) { |
EXPECT_CALL(*mock_pss_, CanSyncStart()).WillRepeatedly(Return(false)); |
- EXPECT_CALL(*mock_pss_, IsOAuthRefreshTokenAvailable()) |
- .WillRepeatedly(Return(false)); |
EXPECT_CALL(*mock_pss_, HasSyncSetupCompleted()) |
.WillRepeatedly(Return(false)); |
// Open the web UI. |
@@ -776,8 +758,6 @@ TEST_F(PeopleHandlerTest, ShowSigninOnAuthError) { |
SigninErrorControllerFactory::GetForProfile(profile_.get())); |
provider.SetAuthError(kTestUser, error_); |
EXPECT_CALL(*mock_pss_, CanSyncStart()).WillRepeatedly(Return(true)); |
- EXPECT_CALL(*mock_pss_, IsOAuthRefreshTokenAvailable()) |
- .WillRepeatedly(Return(true)); |
EXPECT_CALL(*mock_pss_, IsPassphraseRequired()) |
.WillRepeatedly(Return(false)); |
EXPECT_CALL(*mock_pss_, IsUsingSecondaryPassphrase()) |