Index: chrome/browser/ui/webui/sync_setup_handler_unittest.cc |
diff --git a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc |
index 09e49d4c0a4a0b53ed5f0f017587b5353d4d8c97..a400d9421a4667b4e9662aa6ef1f26e3cfe7a6c5 100644 |
--- a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc |
+++ b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc |
@@ -360,7 +360,7 @@ class SyncSetupHandlerTest : public testing::TestWithParam<bool> { |
switches::kUseClientLoginSigninFlow)); |
} |
- error_ = GoogleServiceAuthError::None(); |
+ error_ = GoogleServiceAuthError::AuthErrorNone(); |
profile_.reset(ProfileSyncServiceMock::MakeSignedInTestingProfile()); |
mock_pss_ = static_cast<ProfileSyncServiceMock*>( |
ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse( |
@@ -515,7 +515,7 @@ TEST_P(SyncSetupHandlerTest, DisplayConfigureWithBackendDisabledAndCancel) { |
.WillRepeatedly(Return(true)); |
EXPECT_CALL(*mock_pss_, HasSyncSetupCompleted()) |
.WillRepeatedly(Return(false)); |
- error_ = GoogleServiceAuthError::None(); |
+ error_ = GoogleServiceAuthError::AuthErrorNone(); |
EXPECT_CALL(*mock_pss_, GetAuthError()).WillRepeatedly(ReturnRef(error_)); |
EXPECT_CALL(*mock_pss_, sync_initialized()).WillRepeatedly(Return(false)); |
@@ -557,7 +557,7 @@ TEST_P(SyncSetupHandlerTest, |
.WillRepeatedly(Return(true)); |
EXPECT_CALL(*mock_pss_, HasSyncSetupCompleted()) |
.WillRepeatedly(Return(false)); |
- error_ = GoogleServiceAuthError::None(); |
+ error_ = GoogleServiceAuthError::AuthErrorNone(); |
EXPECT_CALL(*mock_pss_, GetAuthError()).WillRepeatedly(ReturnRef(error_)); |
// Sync backend is stopped initially, and will start up. |
EXPECT_CALL(*mock_pss_, sync_initialized()) |
@@ -614,7 +614,7 @@ TEST_P(SyncSetupHandlerTest, |
.WillRepeatedly(Return(true)); |
EXPECT_CALL(*mock_pss_, HasSyncSetupCompleted()) |
.WillRepeatedly(Return(false)); |
- error_ = GoogleServiceAuthError::None(); |
+ error_ = GoogleServiceAuthError::AuthErrorNone(); |
EXPECT_CALL(*mock_pss_, GetAuthError()).WillRepeatedly(ReturnRef(error_)); |
EXPECT_CALL(*mock_pss_, sync_initialized()) |
.WillOnce(Return(false)) |
@@ -644,7 +644,7 @@ TEST_P(SyncSetupHandlerTest, |
.WillRepeatedly(Return(true)); |
EXPECT_CALL(*mock_pss_, HasSyncSetupCompleted()) |
.WillRepeatedly(Return(false)); |
- error_ = GoogleServiceAuthError::None(); |
+ error_ = GoogleServiceAuthError::AuthErrorNone(); |
EXPECT_CALL(*mock_pss_, GetAuthError()).WillRepeatedly(ReturnRef(error_)); |
EXPECT_CALL(*mock_pss_, sync_initialized()).WillRepeatedly(Return(false)); |