| Index: components/sync/protocol/sync_protocol_error.cc
|
| diff --git a/sync/protocol/sync_protocol_error.cc b/components/sync/protocol/sync_protocol_error.cc
|
| similarity index 83%
|
| rename from sync/protocol/sync_protocol_error.cc
|
| rename to components/sync/protocol/sync_protocol_error.cc
|
| index e7cee2431520fa6eb4062a3ce571e0a5fd43e3aa..5bc617984b1a2f76904b7c3650af1cb94e618418 100644
|
| --- a/sync/protocol/sync_protocol_error.cc
|
| +++ b/components/sync/protocol/sync_protocol_error.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "sync/protocol/sync_protocol_error.h"
|
| +#include "components/sync/protocol/sync_protocol_error.h"
|
|
|
| #include <string>
|
|
|
| @@ -10,7 +10,10 @@
|
| #include "base/values.h"
|
|
|
| namespace syncer {
|
| -#define ENUM_CASE(x) case x: return #x; break;
|
| +#define ENUM_CASE(x) \
|
| + case x: \
|
| + return #x; \
|
| + break;
|
|
|
| const char* GetSyncErrorTypeString(SyncProtocolErrorType type) {
|
| switch (type) {
|
| @@ -46,19 +49,15 @@ const char* GetClientActionString(ClientAction action) {
|
| }
|
|
|
| SyncProtocolError::SyncProtocolError()
|
| - : error_type(UNKNOWN_ERROR),
|
| - action(UNKNOWN_ACTION) {
|
| -}
|
| + : error_type(UNKNOWN_ERROR), action(UNKNOWN_ACTION) {}
|
|
|
| SyncProtocolError::SyncProtocolError(const SyncProtocolError& other) = default;
|
|
|
| -SyncProtocolError::~SyncProtocolError() {
|
| -}
|
| +SyncProtocolError::~SyncProtocolError() {}
|
|
|
| base::DictionaryValue* SyncProtocolError::ToValue() const {
|
| base::DictionaryValue* value = new base::DictionaryValue();
|
| - value->SetString("ErrorType",
|
| - GetSyncErrorTypeString(error_type));
|
| + value->SetString("ErrorType", GetSyncErrorTypeString(error_type));
|
| value->SetString("ErrorDescription", error_description);
|
| value->SetString("url", url);
|
| value->SetString("action", GetClientActionString(action));
|
| @@ -66,4 +65,3 @@ base::DictionaryValue* SyncProtocolError::ToValue() const {
|
| }
|
|
|
| } // namespace syncer
|
| -
|
|
|