| Index: chrome/browser/sync/engine/auth_watcher_unittest.cc
|
| diff --git a/chrome/browser/sync/engine/auth_watcher_unittest.cc b/chrome/browser/sync/engine/auth_watcher_unittest.cc
|
| index 6a0e3dc4f3d51d38f6bf5612cf9b36e8d0ef3511..9a33e5998fb7b6b0259a7f3844e9309a9123888d 100644
|
| --- a/chrome/browser/sync/engine/auth_watcher_unittest.cc
|
| +++ b/chrome/browser/sync/engine/auth_watcher_unittest.cc
|
| @@ -71,11 +71,6 @@ class GaiaAuthMockForAuthWatcher : public gaia::GaiaAuthenticator {
|
| return true;
|
| }
|
|
|
| - bool LookupEmail(AuthResults* results) {
|
| - results->signin = gaia::GMAIL_SIGNIN;
|
| - return true;
|
| - }
|
| -
|
| void RenewAuthToken(const std::string& auth_token) {
|
| renewed_token_ = auth_token;
|
| }
|
| @@ -194,8 +189,8 @@ TEST_F(AuthWatcherTest, Construction) {
|
| TEST_F(AuthWatcherTest, AuthenticateGaiaAuthFailure) {
|
| auth_watcher()->Authenticate(kTestEmail, kWrongPassword,
|
| std::string(), // captcha_token
|
| - std::string(), // captcha_value
|
| - false); // persist_creds_to_disk
|
| + std::string()); // captcha_value
|
| +
|
| EXPECT_EQ(AuthWatcherEvent::AUTHENTICATION_ATTEMPT_START, ConsumeNextEvent());
|
| EXPECT_EQ(AuthWatcherEvent::GAIA_AUTH_FAILED, ConsumeNextEvent());
|
| }
|
| @@ -203,14 +198,14 @@ TEST_F(AuthWatcherTest, AuthenticateGaiaAuthFailure) {
|
| TEST_F(AuthWatcherTest, AuthenticateBadAuthToken) {
|
| gaia_auth()->SendBadAuthTokenForNextRequest();
|
| auth_watcher()->Authenticate(kTestEmail, kCorrectPassword, std::string(),
|
| - std::string(), false);
|
| + std::string());
|
| EXPECT_EQ(AuthWatcherEvent::AUTHENTICATION_ATTEMPT_START, ConsumeNextEvent());
|
| EXPECT_EQ(AuthWatcherEvent::SERVICE_AUTH_FAILED, ConsumeNextEvent());
|
| }
|
|
|
| TEST_F(AuthWatcherTest, AuthenticateSuccess) {
|
| auth_watcher()->Authenticate(kTestEmail, kCorrectPassword, std::string(),
|
| - std::string(), false);
|
| + std::string());
|
| EXPECT_EQ(AuthWatcherEvent::AUTHENTICATION_ATTEMPT_START, ConsumeNextEvent());
|
| EXPECT_EQ(AuthWatcherEvent::AUTH_SUCCEEDED, ConsumeNextEvent());
|
|
|
| @@ -233,7 +228,7 @@ TEST_F(AuthWatcherTest, AuthenticateWithTokenSuccess) {
|
| // Just check that the thread task was properly issued.
|
| TEST_F(AuthWatcherTest, RenewAuthToken) {
|
| auth_watcher()->Authenticate(kTestEmail, kCorrectPassword, std::string(),
|
| - std::string(), false);
|
| + std::string());
|
| EXPECT_EQ(AuthWatcherEvent::AUTHENTICATION_ATTEMPT_START, ConsumeNextEvent());
|
| EXPECT_EQ(AuthWatcherEvent::AUTH_SUCCEEDED, ConsumeNextEvent());
|
|
|
|
|