| Index: components/signin/core/browser/webdata/token_service_table.cc
|
| diff --git a/components/signin/core/browser/webdata/token_service_table.cc b/components/signin/core/browser/webdata/token_service_table.cc
|
| index 9333ba74cac8d5fc204dc5650b07b67aeb0e79a7..00f49269140c532a5d66718f3b0470b263537645 100644
|
| --- a/components/signin/core/browser/webdata/token_service_table.cc
|
| +++ b/components/signin/core/browser/webdata/token_service_table.cc
|
| @@ -89,7 +89,7 @@ bool TokenServiceTable::SetTokenForService(const std::string& service,
|
| return s.Run();
|
| }
|
|
|
| -bool TokenServiceTable::GetAllTokens(
|
| +TokenServiceTable::Result TokenServiceTable::GetAllTokens(
|
| std::map<std::string, std::string>* tokens) {
|
| sql::Statement s(db_->GetUniqueStatement(
|
| "SELECT service, encrypted_token FROM token_service"));
|
| @@ -98,9 +98,10 @@ bool TokenServiceTable::GetAllTokens(
|
| LOG(ERROR) << "Failed to load tokens (invalid SQL statement).";
|
| base::RecordAction(
|
| base::UserMetricsAction("Signin_TokenTable_GetAllTokensInvalidSql"));
|
| - return false;
|
| + return TOKEN_DB_RESULT_SQL_INVALID_STATEMENT;
|
| }
|
|
|
| + Result result = TOKEN_DB_RESULT_SUCCESS;
|
| while (s.Step()) {
|
| std::string encrypted_token;
|
| std::string decrypted_token;
|
| @@ -119,12 +120,13 @@ bool TokenServiceTable::GetAllTokens(
|
| LOG(ERROR) << "Failed to decrypt token for service " << service;
|
| base::RecordAction(
|
| base::UserMetricsAction("Signin_TokenTable_DecryptFailed"));
|
| + result = TOKEN_DB_RESULT_DECRYPT_ERROR;
|
| }
|
| } else {
|
| LOG(ERROR) << "Bad token entry for service " << service;
|
| base::RecordAction(base::UserMetricsAction("Signin_TokenTable_BadEntry"));
|
| - return false;
|
| + result = TOKEN_DB_RESULT_BAD_ENTRY;
|
| }
|
| }
|
| - return true;
|
| + return result;
|
| }
|
|
|