| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 GoogleServiceAuthError::State table[] = { | 148 GoogleServiceAuthError::State table[] = { |
| 149 GoogleServiceAuthError::NONE, | 149 GoogleServiceAuthError::NONE, |
| 150 GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS, | 150 GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS, |
| 151 GoogleServiceAuthError::USER_NOT_SIGNED_UP, | 151 GoogleServiceAuthError::USER_NOT_SIGNED_UP, |
| 152 GoogleServiceAuthError::CONNECTION_FAILED, | 152 GoogleServiceAuthError::CONNECTION_FAILED, |
| 153 GoogleServiceAuthError::CAPTCHA_REQUIRED, | 153 GoogleServiceAuthError::CAPTCHA_REQUIRED, |
| 154 GoogleServiceAuthError::ACCOUNT_DELETED, | 154 GoogleServiceAuthError::ACCOUNT_DELETED, |
| 155 GoogleServiceAuthError::ACCOUNT_DISABLED, | 155 GoogleServiceAuthError::ACCOUNT_DISABLED, |
| 156 GoogleServiceAuthError::SERVICE_UNAVAILABLE, | 156 GoogleServiceAuthError::SERVICE_UNAVAILABLE, |
| 157 GoogleServiceAuthError::TWO_FACTOR, | 157 GoogleServiceAuthError::TWO_FACTOR, |
| 158 GoogleServiceAuthError::REQUEST_CANCELED, | 158 GoogleServiceAuthError::REQUEST_CANCELED |
| 159 GoogleServiceAuthError::HOSTED_NOT_ALLOWED | |
| 160 }; | 159 }; |
| 161 | 160 |
| 162 for (size_t i = 0; i < arraysize(table); ++i) { | 161 for (size_t i = 0; i < arraysize(table); ++i) { |
| 163 VerifySyncGlobalErrorResult(&service, | 162 VerifySyncGlobalErrorResult(&service, |
| 164 table[i], | 163 table[i], |
| 165 true /* signed in */, | 164 true /* signed in */, |
| 166 false /* no error */); | 165 false /* no error */); |
| 167 VerifySyncGlobalErrorResult(&service, | 166 VerifySyncGlobalErrorResult(&service, |
| 168 table[i], | 167 table[i], |
| 169 false /* not signed in */, | 168 false /* not signed in */, |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 429 // from previous one. | 428 // from previous one. |
| 430 status.sync_protocol_error.action = syncer::UPGRADE_CLIENT; | 429 status.sync_protocol_error.action = syncer::UPGRADE_CLIENT; |
| 431 EXPECT_CALL(service, QueryDetailedSyncStatus(_)) | 430 EXPECT_CALL(service, QueryDetailedSyncStatus(_)) |
| 432 .WillOnce(DoAll(SetArgPointee<0>(status), Return(true))); | 431 .WillOnce(DoAll(SetArgPointee<0>(status), Return(true))); |
| 433 base::string16 upgrade_client_status_label; | 432 base::string16 upgrade_client_status_label; |
| 434 sync_ui_util::GetStatusLabels(profile.get(), &service, *signin, | 433 sync_ui_util::GetStatusLabels(profile.get(), &service, *signin, |
| 435 sync_ui_util::PLAIN_TEXT, | 434 sync_ui_util::PLAIN_TEXT, |
| 436 &upgrade_client_status_label, &link_label); | 435 &upgrade_client_status_label, &link_label); |
| 437 EXPECT_NE(unrecoverable_error_status_label, upgrade_client_status_label); | 436 EXPECT_NE(unrecoverable_error_status_label, upgrade_client_status_label); |
| 438 } | 437 } |
| OLD | NEW |