| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <set> | 5 #include <set> |
| 6 #include "base/basictypes.h" | 6 #include "base/basictypes.h" |
| 7 #include "base/stringprintf.h" | 7 #include "base/stringprintf.h" |
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/signin/signin_manager.h" | 10 #include "chrome/browser/signin/signin_manager.h" |
| 11 #include "chrome/browser/signin/signin_manager_fake.h" | 11 #include "chrome/browser/signin/signin_manager_fake.h" |
| 12 #include "chrome/browser/sync/profile_sync_service_mock.h" | 12 #include "chrome/browser/sync/profile_sync_service_mock.h" |
| 13 #include "chrome/browser/sync/sync_ui_util.h" | 13 #include "chrome/browser/sync/sync_ui_util.h" |
| 14 #include "content/public/test/test_browser_thread.h" | 14 #include "content/public/test/test_browser_thread.h" |
| 15 #include "grit/generated_resources.h" | 15 #include "grit/generated_resources.h" |
| 16 #include "testing/gmock/include/gmock/gmock-actions.h" | 16 #include "testing/gmock/include/gmock/gmock-actions.h" |
| 17 #include "testing/gmock/include/gmock/gmock.h" | 17 #include "testing/gmock/include/gmock/gmock.h" |
| 18 #include "testing/gtest/include/gtest/gtest.h" | 18 #include "testing/gtest/include/gtest/gtest.h" |
| 19 #include "ui/base/l10n/l10n_util.h" | 19 #include "ui/base/l10n/l10n_util.h" |
| 20 | 20 |
| 21 using ::testing::AtMost; | 21 using ::testing::AtMost; |
| 22 using ::testing::NiceMock; |
| 22 using ::testing::Return; | 23 using ::testing::Return; |
| 23 using ::testing::ReturnRef; | 24 using ::testing::ReturnRef; |
| 24 using ::testing::NiceMock; | 25 using ::testing::SetArgPointee; |
| 26 using ::testing::_; |
| 25 using content::BrowserThread; | 27 using content::BrowserThread; |
| 26 | 28 |
| 27 // A number of distinct states of the ProfileSyncService can be generated for | 29 // A number of distinct states of the ProfileSyncService can be generated for |
| 28 // tests. | 30 // tests. |
| 29 enum DistinctState { | 31 enum DistinctState { |
| 30 STATUS_CASE_SETUP_IN_PROGRESS, | 32 STATUS_CASE_SETUP_IN_PROGRESS, |
| 31 STATUS_CASE_SETUP_ERROR, | 33 STATUS_CASE_SETUP_ERROR, |
| 32 STATUS_CASE_AUTHENTICATING, | 34 STATUS_CASE_AUTHENTICATING, |
| 33 STATUS_CASE_AUTH_ERROR, | 35 STATUS_CASE_AUTH_ERROR, |
| 34 STATUS_CASE_PROTOCOL_ERROR, | 36 STATUS_CASE_PROTOCOL_ERROR, |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 NiceMock<ProfileSyncServiceMock> service(profile.get()); | 78 NiceMock<ProfileSyncServiceMock> service(profile.get()); |
| 77 DictionaryValue strings; | 79 DictionaryValue strings; |
| 78 | 80 |
| 79 // Will be released when the dictionary is destroyed | 81 // Will be released when the dictionary is destroyed |
| 80 string16 str(ASCIIToUTF16("none")); | 82 string16 str(ASCIIToUTF16("none")); |
| 81 | 83 |
| 82 browser_sync::SyncBackendHost::Status status; | 84 browser_sync::SyncBackendHost::Status status; |
| 83 | 85 |
| 84 EXPECT_CALL(service, HasSyncSetupCompleted()) | 86 EXPECT_CALL(service, HasSyncSetupCompleted()) |
| 85 .WillOnce(Return(true)); | 87 .WillOnce(Return(true)); |
| 86 EXPECT_CALL(service, QueryDetailedSyncStatus()) | 88 EXPECT_CALL(service, QueryDetailedSyncStatus(_)) |
| 87 .WillOnce(Return(status)); | 89 .WillOnce(Return(false)); |
| 88 | 90 |
| 89 EXPECT_CALL(service, HasUnrecoverableError()) | 91 EXPECT_CALL(service, HasUnrecoverableError()) |
| 90 .WillRepeatedly(Return(true)); | 92 .WillRepeatedly(Return(true)); |
| 91 | 93 |
| 92 EXPECT_CALL(service, GetLastSyncedTimeString()) | 94 EXPECT_CALL(service, GetLastSyncedTimeString()) |
| 93 .WillOnce(Return(str)); | 95 .WillOnce(Return(str)); |
| 94 | 96 |
| 95 sync_ui_util::ConstructAboutInformation(&service, &strings); | 97 sync_ui_util::ConstructAboutInformation(&service, &strings); |
| 96 | 98 |
| 97 EXPECT_TRUE(strings.HasKey("unrecoverable_error_detected")); | 99 EXPECT_TRUE(strings.HasKey("unrecoverable_error_detected")); |
| 98 } | 100 } |
| 99 | 101 |
| 100 // Test that GetStatusLabelsForSyncGlobalError returns an error if a | 102 // Test that GetStatusLabelsForSyncGlobalError returns an error if a |
| 101 // passphrase is required. | 103 // passphrase is required. |
| 102 TEST(SyncUIUtilTest, PassphraseGlobalError) { | 104 TEST(SyncUIUtilTest, PassphraseGlobalError) { |
| 103 MessageLoopForUI message_loop; | 105 MessageLoopForUI message_loop; |
| 104 content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); | 106 content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); |
| 105 scoped_ptr<Profile> profile( | 107 scoped_ptr<Profile> profile( |
| 106 ProfileSyncServiceMock::MakeSignedInTestingProfile()); | 108 ProfileSyncServiceMock::MakeSignedInTestingProfile()); |
| 107 NiceMock<ProfileSyncServiceMock> service(profile.get()); | 109 NiceMock<ProfileSyncServiceMock> service(profile.get()); |
| 108 FakeSigninManager signin; | 110 FakeSigninManager signin; |
| 109 browser_sync::SyncBackendHost::Status status; | 111 browser_sync::SyncBackendHost::Status status; |
| 110 EXPECT_CALL(service, QueryDetailedSyncStatus()) | 112 EXPECT_CALL(service, QueryDetailedSyncStatus(_)) |
| 111 .WillRepeatedly(Return(status)); | 113 .WillRepeatedly(Return(false)); |
| 112 | 114 |
| 113 EXPECT_CALL(service, IsPassphraseRequired()) | 115 EXPECT_CALL(service, IsPassphraseRequired()) |
| 114 .WillRepeatedly(Return(true)); | 116 .WillRepeatedly(Return(true)); |
| 115 EXPECT_CALL(service, IsPassphraseRequiredForDecryption()) | 117 EXPECT_CALL(service, IsPassphraseRequiredForDecryption()) |
| 116 .WillRepeatedly(Return(true)); | 118 .WillRepeatedly(Return(true)); |
| 117 VerifySyncGlobalErrorResult( | 119 VerifySyncGlobalErrorResult( |
| 118 &service, signin, GoogleServiceAuthError::NONE, true, true); | 120 &service, signin, GoogleServiceAuthError::NONE, true, true); |
| 119 } | 121 } |
| 120 | 122 |
| 121 // Test that GetStatusLabelsForSyncGlobalError returns an error if a | 123 // Test that GetStatusLabelsForSyncGlobalError returns an error if a |
| 122 // passphrase is required. | 124 // passphrase is required. |
| 123 TEST(SyncUIUtilTest, AuthAndPassphraseGlobalError) { | 125 TEST(SyncUIUtilTest, AuthAndPassphraseGlobalError) { |
| 124 MessageLoopForUI message_loop; | 126 MessageLoopForUI message_loop; |
| 125 content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); | 127 content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); |
| 126 scoped_ptr<Profile> profile( | 128 scoped_ptr<Profile> profile( |
| 127 ProfileSyncServiceMock::MakeSignedInTestingProfile()); | 129 ProfileSyncServiceMock::MakeSignedInTestingProfile()); |
| 128 NiceMock<ProfileSyncServiceMock> service(profile.get()); | 130 NiceMock<ProfileSyncServiceMock> service(profile.get()); |
| 129 FakeSigninManager signin; | 131 FakeSigninManager signin; |
| 130 browser_sync::SyncBackendHost::Status status; | 132 browser_sync::SyncBackendHost::Status status; |
| 131 EXPECT_CALL(service, QueryDetailedSyncStatus()) | 133 EXPECT_CALL(service, QueryDetailedSyncStatus(_)) |
| 132 .WillRepeatedly(Return(status)); | 134 .WillRepeatedly(Return(false)); |
| 133 | 135 |
| 134 EXPECT_CALL(service, IsPassphraseRequired()) | 136 EXPECT_CALL(service, IsPassphraseRequired()) |
| 135 .WillRepeatedly(Return(true)); | 137 .WillRepeatedly(Return(true)); |
| 136 EXPECT_CALL(service, IsPassphraseRequiredForDecryption()) | 138 EXPECT_CALL(service, IsPassphraseRequiredForDecryption()) |
| 137 .WillRepeatedly(Return(true)); | 139 .WillRepeatedly(Return(true)); |
| 138 EXPECT_CALL(service, HasSyncSetupCompleted()) | 140 EXPECT_CALL(service, HasSyncSetupCompleted()) |
| 139 .WillRepeatedly(Return(true)); | 141 .WillRepeatedly(Return(true)); |
| 140 | 142 |
| 141 GoogleServiceAuthError auth_error( | 143 GoogleServiceAuthError auth_error( |
| 142 GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS); | 144 GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS); |
| (...skipping 10 matching lines...) Expand all Loading... |
| 153 // that can be resolved by the user and suppresses errors for conditions that | 155 // that can be resolved by the user and suppresses errors for conditions that |
| 154 // cannot be resolved by the user. | 156 // cannot be resolved by the user. |
| 155 TEST(SyncUIUtilTest, AuthStateGlobalError) { | 157 TEST(SyncUIUtilTest, AuthStateGlobalError) { |
| 156 MessageLoopForUI message_loop; | 158 MessageLoopForUI message_loop; |
| 157 content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); | 159 content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); |
| 158 scoped_ptr<Profile> profile( | 160 scoped_ptr<Profile> profile( |
| 159 ProfileSyncServiceMock::MakeSignedInTestingProfile()); | 161 ProfileSyncServiceMock::MakeSignedInTestingProfile()); |
| 160 NiceMock<ProfileSyncServiceMock> service(profile.get()); | 162 NiceMock<ProfileSyncServiceMock> service(profile.get()); |
| 161 | 163 |
| 162 browser_sync::SyncBackendHost::Status status; | 164 browser_sync::SyncBackendHost::Status status; |
| 163 EXPECT_CALL(service, QueryDetailedSyncStatus()) | 165 EXPECT_CALL(service, QueryDetailedSyncStatus(_)) |
| 164 .WillRepeatedly(Return(status)); | 166 .WillRepeatedly(Return(false)); |
| 165 | 167 |
| 166 struct { | 168 struct { |
| 167 GoogleServiceAuthError::State error_state; | 169 GoogleServiceAuthError::State error_state; |
| 168 bool is_error; | 170 bool is_error; |
| 169 } table[] = { | 171 } table[] = { |
| 170 { GoogleServiceAuthError::NONE, false }, | 172 { GoogleServiceAuthError::NONE, false }, |
| 171 { GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS, true }, | 173 { GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS, true }, |
| 172 { GoogleServiceAuthError::USER_NOT_SIGNED_UP, true }, | 174 { GoogleServiceAuthError::USER_NOT_SIGNED_UP, true }, |
| 173 { GoogleServiceAuthError::CONNECTION_FAILED, false }, | 175 { GoogleServiceAuthError::CONNECTION_FAILED, false }, |
| 174 { GoogleServiceAuthError::CAPTCHA_REQUIRED, true }, | 176 { GoogleServiceAuthError::CAPTCHA_REQUIRED, true }, |
| (...skipping 22 matching lines...) Expand all Loading... |
| 197 // Auth Error object is returned by reference in mock and needs to stay in | 199 // Auth Error object is returned by reference in mock and needs to stay in |
| 198 // scope throughout test, so it is owned by calling method. However it is | 200 // scope throughout test, so it is owned by calling method. However it is |
| 199 // immutable so can only be allocated in this method. | 201 // immutable so can only be allocated in this method. |
| 200 switch (caseNumber) { | 202 switch (caseNumber) { |
| 201 case STATUS_CASE_SETUP_IN_PROGRESS: { | 203 case STATUS_CASE_SETUP_IN_PROGRESS: { |
| 202 EXPECT_CALL(service, HasSyncSetupCompleted()) | 204 EXPECT_CALL(service, HasSyncSetupCompleted()) |
| 203 .WillOnce(Return(false)); | 205 .WillOnce(Return(false)); |
| 204 EXPECT_CALL(service, FirstSetupInProgress()) | 206 EXPECT_CALL(service, FirstSetupInProgress()) |
| 205 .WillOnce(Return(true)); | 207 .WillOnce(Return(true)); |
| 206 browser_sync::SyncBackendHost::Status status; | 208 browser_sync::SyncBackendHost::Status status; |
| 207 EXPECT_CALL(service, QueryDetailedSyncStatus()) | 209 EXPECT_CALL(service, QueryDetailedSyncStatus(_)) |
| 208 .WillOnce(Return(status)); | 210 .WillOnce(DoAll(SetArgPointee<0>(status), |
| 211 Return(false))); |
| 209 *auth_error = new GoogleServiceAuthError(GoogleServiceAuthError::NONE); | 212 *auth_error = new GoogleServiceAuthError(GoogleServiceAuthError::NONE); |
| 210 EXPECT_CALL(service, GetAuthError()) | 213 EXPECT_CALL(service, GetAuthError()) |
| 211 .WillOnce(ReturnRef(**auth_error)); | 214 .WillOnce(ReturnRef(**auth_error)); |
| 212 EXPECT_CALL(signin, AuthInProgress()).WillRepeatedly(Return(false)); | 215 EXPECT_CALL(signin, AuthInProgress()).WillRepeatedly(Return(false)); |
| 213 return; | 216 return; |
| 214 } | 217 } |
| 215 case STATUS_CASE_SETUP_ERROR: { | 218 case STATUS_CASE_SETUP_ERROR: { |
| 216 EXPECT_CALL(service, HasSyncSetupCompleted()) | 219 EXPECT_CALL(service, HasSyncSetupCompleted()) |
| 217 .WillOnce(Return(false)); | 220 .WillOnce(Return(false)); |
| 218 EXPECT_CALL(service, FirstSetupInProgress()) | 221 EXPECT_CALL(service, FirstSetupInProgress()) |
| 219 .WillOnce(Return(false)); | 222 .WillOnce(Return(false)); |
| 220 EXPECT_CALL(service, HasUnrecoverableError()) | 223 EXPECT_CALL(service, HasUnrecoverableError()) |
| 221 .WillOnce(Return(true)); | 224 .WillOnce(Return(true)); |
| 222 EXPECT_CALL(signin, AuthInProgress()).WillRepeatedly(Return(false)); | 225 EXPECT_CALL(signin, AuthInProgress()).WillRepeatedly(Return(false)); |
| 223 browser_sync::SyncBackendHost::Status status; | 226 browser_sync::SyncBackendHost::Status status; |
| 224 EXPECT_CALL(service, QueryDetailedSyncStatus()) | 227 EXPECT_CALL(service, QueryDetailedSyncStatus(_)) |
| 225 .WillOnce(Return(status)); | 228 .WillOnce(DoAll(SetArgPointee<0>(status), |
| 229 Return(false))); |
| 226 return; | 230 return; |
| 227 } | 231 } |
| 228 case STATUS_CASE_AUTHENTICATING: { | 232 case STATUS_CASE_AUTHENTICATING: { |
| 229 EXPECT_CALL(service, HasSyncSetupCompleted()) | 233 EXPECT_CALL(service, HasSyncSetupCompleted()) |
| 230 .WillOnce(Return(true)); | 234 .WillOnce(Return(true)); |
| 231 browser_sync::SyncBackendHost::Status status; | 235 browser_sync::SyncBackendHost::Status status; |
| 232 EXPECT_CALL(service, QueryDetailedSyncStatus()) | 236 EXPECT_CALL(service, QueryDetailedSyncStatus(_)) |
| 233 .WillOnce(Return(status)); | 237 .WillOnce(DoAll(SetArgPointee<0>(status), |
| 238 Return(false))); |
| 234 EXPECT_CALL(service, HasUnrecoverableError()) | 239 EXPECT_CALL(service, HasUnrecoverableError()) |
| 235 .WillOnce(Return(false)); | 240 .WillOnce(Return(false)); |
| 236 EXPECT_CALL(signin, AuthInProgress()).WillRepeatedly(Return(true)); | 241 EXPECT_CALL(signin, AuthInProgress()).WillRepeatedly(Return(true)); |
| 237 *auth_error = new GoogleServiceAuthError(GoogleServiceAuthError::NONE); | 242 *auth_error = new GoogleServiceAuthError(GoogleServiceAuthError::NONE); |
| 238 EXPECT_CALL(service, GetAuthError()) | 243 EXPECT_CALL(service, GetAuthError()) |
| 239 .WillOnce(ReturnRef(**auth_error)); | 244 .WillOnce(ReturnRef(**auth_error)); |
| 240 return; | 245 return; |
| 241 } | 246 } |
| 242 case STATUS_CASE_AUTH_ERROR: { | 247 case STATUS_CASE_AUTH_ERROR: { |
| 243 EXPECT_CALL(service, HasSyncSetupCompleted()) | 248 EXPECT_CALL(service, HasSyncSetupCompleted()) |
| 244 .WillOnce(Return(true)); | 249 .WillOnce(Return(true)); |
| 245 browser_sync::SyncBackendHost::Status status; | 250 browser_sync::SyncBackendHost::Status status; |
| 246 EXPECT_CALL(service, QueryDetailedSyncStatus()) | 251 EXPECT_CALL(service, QueryDetailedSyncStatus(_)) |
| 247 .WillOnce(Return(status)); | 252 .WillOnce(DoAll(SetArgPointee<0>(status), |
| 253 Return(false))); |
| 248 *auth_error = new GoogleServiceAuthError( | 254 *auth_error = new GoogleServiceAuthError( |
| 249 GoogleServiceAuthError::SERVICE_UNAVAILABLE); | 255 GoogleServiceAuthError::SERVICE_UNAVAILABLE); |
| 250 EXPECT_CALL(service, HasUnrecoverableError()) | 256 EXPECT_CALL(service, HasUnrecoverableError()) |
| 251 .WillOnce(Return(false)); | 257 .WillOnce(Return(false)); |
| 252 EXPECT_CALL(signin, AuthInProgress()).WillRepeatedly(Return(false)); | 258 EXPECT_CALL(signin, AuthInProgress()).WillRepeatedly(Return(false)); |
| 253 EXPECT_CALL(service, GetAuthError()) | 259 EXPECT_CALL(service, GetAuthError()) |
| 254 .WillOnce(ReturnRef(**auth_error)); | 260 .WillOnce(ReturnRef(**auth_error)); |
| 255 return; | 261 return; |
| 256 } | 262 } |
| 257 case STATUS_CASE_PROTOCOL_ERROR: { | 263 case STATUS_CASE_PROTOCOL_ERROR: { |
| 258 EXPECT_CALL(service, HasSyncSetupCompleted()) | 264 EXPECT_CALL(service, HasSyncSetupCompleted()) |
| 259 .WillOnce(Return(true)); | 265 .WillOnce(Return(true)); |
| 260 syncer::SyncProtocolError protocolError; | 266 syncer::SyncProtocolError protocolError; |
| 261 protocolError.action = syncer::STOP_AND_RESTART_SYNC; | 267 protocolError.action = syncer::STOP_AND_RESTART_SYNC; |
| 262 browser_sync::SyncBackendHost::Status status; | 268 browser_sync::SyncBackendHost::Status status; |
| 263 status.sync_protocol_error = protocolError; | 269 status.sync_protocol_error = protocolError; |
| 264 EXPECT_CALL(service, QueryDetailedSyncStatus()) | 270 EXPECT_CALL(service, QueryDetailedSyncStatus(_)) |
| 265 .WillOnce(Return(status)); | 271 .WillOnce(DoAll(SetArgPointee<0>(status), |
| 272 Return(false))); |
| 266 *auth_error = new GoogleServiceAuthError(GoogleServiceAuthError::NONE); | 273 *auth_error = new GoogleServiceAuthError(GoogleServiceAuthError::NONE); |
| 267 EXPECT_CALL(service, GetAuthError()) | 274 EXPECT_CALL(service, GetAuthError()) |
| 268 .WillOnce(ReturnRef(**auth_error)); | 275 .WillOnce(ReturnRef(**auth_error)); |
| 269 EXPECT_CALL(signin, AuthInProgress()).WillRepeatedly(Return(false)); | 276 EXPECT_CALL(signin, AuthInProgress()).WillRepeatedly(Return(false)); |
| 270 EXPECT_CALL(service, HasUnrecoverableError()) | 277 EXPECT_CALL(service, HasUnrecoverableError()) |
| 271 .WillOnce(Return(false)); | 278 .WillOnce(Return(false)); |
| 272 return; | 279 return; |
| 273 } | 280 } |
| 274 case STATUS_CASE_PASSPHRASE_ERROR: { | 281 case STATUS_CASE_PASSPHRASE_ERROR: { |
| 275 EXPECT_CALL(service, HasSyncSetupCompleted()) | 282 EXPECT_CALL(service, HasSyncSetupCompleted()) |
| 276 .WillOnce(Return(true)); | 283 .WillOnce(Return(true)); |
| 277 browser_sync::SyncBackendHost::Status status; | 284 browser_sync::SyncBackendHost::Status status; |
| 278 EXPECT_CALL(service, QueryDetailedSyncStatus()) | 285 EXPECT_CALL(service, QueryDetailedSyncStatus(_)) |
| 279 .WillOnce(Return(status)); | 286 .WillOnce(DoAll(SetArgPointee<0>(status), |
| 287 Return(false))); |
| 280 *auth_error = new GoogleServiceAuthError(GoogleServiceAuthError::NONE); | 288 *auth_error = new GoogleServiceAuthError(GoogleServiceAuthError::NONE); |
| 281 EXPECT_CALL(service, GetAuthError()) | 289 EXPECT_CALL(service, GetAuthError()) |
| 282 .WillOnce(ReturnRef(**auth_error)); | 290 .WillOnce(ReturnRef(**auth_error)); |
| 283 EXPECT_CALL(service, HasUnrecoverableError()) | 291 EXPECT_CALL(service, HasUnrecoverableError()) |
| 284 .WillOnce(Return(false)); | 292 .WillOnce(Return(false)); |
| 285 EXPECT_CALL(signin, AuthInProgress()).WillRepeatedly(Return(false)); | 293 EXPECT_CALL(signin, AuthInProgress()).WillRepeatedly(Return(false)); |
| 286 EXPECT_CALL(service, IsPassphraseRequired()) | 294 EXPECT_CALL(service, IsPassphraseRequired()) |
| 287 .WillOnce(Return(true)); | 295 .WillOnce(Return(true)); |
| 288 EXPECT_CALL(service, IsPassphraseRequiredForDecryption()) | 296 EXPECT_CALL(service, IsPassphraseRequiredForDecryption()) |
| 289 .WillOnce(Return(true)); | 297 .WillOnce(Return(true)); |
| 290 return; | 298 return; |
| 291 } | 299 } |
| 292 case STATUS_CASE_SYNCED: { | 300 case STATUS_CASE_SYNCED: { |
| 293 EXPECT_CALL(service, HasSyncSetupCompleted()) | 301 EXPECT_CALL(service, HasSyncSetupCompleted()) |
| 294 .WillOnce(Return(true)); | 302 .WillOnce(Return(true)); |
| 295 browser_sync::SyncBackendHost::Status status; | 303 browser_sync::SyncBackendHost::Status status; |
| 296 EXPECT_CALL(service, QueryDetailedSyncStatus()) | 304 EXPECT_CALL(service, QueryDetailedSyncStatus(_)) |
| 297 .WillOnce(Return(status)); | 305 .WillOnce(DoAll(SetArgPointee<0>(status), |
| 306 Return(false))); |
| 298 *auth_error = new GoogleServiceAuthError(GoogleServiceAuthError::NONE); | 307 *auth_error = new GoogleServiceAuthError(GoogleServiceAuthError::NONE); |
| 299 EXPECT_CALL(service, GetAuthError()) | 308 EXPECT_CALL(service, GetAuthError()) |
| 300 .WillOnce(ReturnRef(**auth_error)); | 309 .WillOnce(ReturnRef(**auth_error)); |
| 301 EXPECT_CALL(signin, AuthInProgress()).WillRepeatedly(Return(false)); | 310 EXPECT_CALL(signin, AuthInProgress()).WillRepeatedly(Return(false)); |
| 302 EXPECT_CALL(service, HasUnrecoverableError()) | 311 EXPECT_CALL(service, HasUnrecoverableError()) |
| 303 .WillOnce(Return(false)); | 312 .WillOnce(Return(false)); |
| 304 EXPECT_CALL(service, IsPassphraseRequired()) | 313 EXPECT_CALL(service, IsPassphraseRequired()) |
| 305 .WillOnce(Return(false)); | 314 .WillOnce(Return(false)); |
| 306 return; | 315 return; |
| 307 } | 316 } |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 361 // Ensures a search for string 'href' (found in links, not a string to be | 370 // Ensures a search for string 'href' (found in links, not a string to be |
| 362 // found in an English language message) fails when links are excluded from | 371 // found in an English language message) fails when links are excluded from |
| 363 // the status label. | 372 // the status label. |
| 364 EXPECT_EQ(status_label.find(string16(ASCIIToUTF16("href"))), | 373 EXPECT_EQ(status_label.find(string16(ASCIIToUTF16("href"))), |
| 365 string16::npos); | 374 string16::npos); |
| 366 if (auth_error) { | 375 if (auth_error) { |
| 367 delete auth_error; | 376 delete auth_error; |
| 368 } | 377 } |
| 369 } | 378 } |
| 370 } | 379 } |
| OLD | NEW |