| Index: chrome/browser/sync/protocol/sync_protocol_error.cc
|
| diff --git a/chrome/browser/sync/protocol/sync_protocol_error.cc b/chrome/browser/sync/protocol/sync_protocol_error.cc
|
| index 7727f41539ab625010cdb254d19efa412cc74226..674486a20b95a5ef24a203058ec706a3b1014413 100644
|
| --- a/chrome/browser/sync/protocol/sync_protocol_error.cc
|
| +++ b/chrome/browser/sync/protocol/sync_protocol_error.cc
|
| @@ -12,9 +12,14 @@
|
| namespace browser_sync {
|
| #define ENUM_CASE(x) case x: return #x; break;
|
|
|
| -const char* GetSyncErrorTypeString(SyncProtocolErrorType type) {
|
| +const char* GetSyncErrorTypeString(SyncOperationResultType type) {
|
| switch (type) {
|
| - ENUM_CASE(SYNC_SUCCESS);
|
| + ENUM_CASE(OPERATION_SUCCESS);
|
| + ENUM_CASE(DIRECTORY_LOOKUP_FAILED);
|
| + ENUM_CASE(NETWORK_CONNECTION_UNAVAILABLE);
|
| + ENUM_CASE(NETWORK_IO_ERROR);
|
| + ENUM_CASE(SYNC_SERVER_ERROR);
|
| + ENUM_CASE(SYNC_AUTH_ERROR);
|
| ENUM_CASE(NOT_MY_BIRTHDAY);
|
| ENUM_CASE(THROTTLED);
|
| ENUM_CASE(CLEAR_PENDING);
|
| @@ -22,6 +27,7 @@ const char* GetSyncErrorTypeString(SyncProtocolErrorType type) {
|
| ENUM_CASE(NON_RETRIABLE_ERROR);
|
| ENUM_CASE(MIGRATION_DONE);
|
| ENUM_CASE(INVALID_CREDENTIAL);
|
| + ENUM_CASE(INVALID);
|
| ENUM_CASE(UNKNOWN_ERROR);
|
| }
|
| NOTREACHED();
|
| @@ -41,15 +47,15 @@ const char* GetClientActionString(ClientAction action) {
|
| return "";
|
| }
|
|
|
| -SyncProtocolError::SyncProtocolError()
|
| - : error_type(UNKNOWN_ERROR),
|
| +SyncOperationResult::SyncOperationResult()
|
| + : error_type(INVALID),
|
| action(UNKNOWN_ACTION) {
|
| }
|
|
|
| -SyncProtocolError::~SyncProtocolError() {
|
| +SyncOperationResult::~SyncOperationResult() {
|
| }
|
|
|
| -DictionaryValue* SyncProtocolError::ToValue() const {
|
| +DictionaryValue* SyncOperationResult::ToValue() const {
|
| DictionaryValue* value = new DictionaryValue();
|
| value->SetString("ErrorType",
|
| GetSyncErrorTypeString(error_type));
|
|
|