| Index: sync/api/sync_error.cc
|
| diff --git a/sync/api/sync_error.cc b/sync/api/sync_error.cc
|
| index 307f3393974e150b931ec7b8c0d5b512cb76773c..12090404d1670f03670b89c9deca0b829c58c238 100644
|
| --- a/sync/api/sync_error.cc
|
| +++ b/sync/api/sync_error.cc
|
| @@ -18,7 +18,7 @@ SyncError::SyncError() {
|
|
|
| SyncError::SyncError(const tracked_objects::Location& location,
|
| const std::string& message,
|
| - syncer::ModelType type) {
|
| + ModelType type) {
|
| Init(location, message, type);
|
| PrintLogError();
|
| }
|
| @@ -51,19 +51,19 @@ void SyncError::Copy(const SyncError& other) {
|
| void SyncError::Clear() {
|
| location_.reset();
|
| message_ = std::string();
|
| - type_ = syncer::UNSPECIFIED;
|
| + type_ = UNSPECIFIED;
|
| }
|
|
|
| void SyncError::Reset(const tracked_objects::Location& location,
|
| const std::string& message,
|
| - syncer::ModelType type) {
|
| + ModelType type) {
|
| Init(location, message, type);
|
| PrintLogError();
|
| }
|
|
|
| void SyncError::Init(const tracked_objects::Location& location,
|
| const std::string& message,
|
| - syncer::ModelType type) {
|
| + ModelType type) {
|
| location_.reset(new tracked_objects::Location(location));
|
| message_ = message;
|
| type_ = type;
|
| @@ -84,7 +84,7 @@ const std::string& SyncError::message() const {
|
| return message_;
|
| }
|
|
|
| -syncer::ModelType SyncError::type() const {
|
| +ModelType SyncError::type() const {
|
| CHECK(IsSet());
|
| return type_;
|
| }
|
| @@ -93,7 +93,7 @@ std::string SyncError::ToString() const {
|
| if (!IsSet()) {
|
| return std::string();
|
| }
|
| - return location_->ToString() + ", " + syncer::ModelTypeToString(type_) +
|
| + return location_->ToString() + ", " + ModelTypeToString(type_) +
|
| ", Sync Error: " + message_;
|
| }
|
|
|
| @@ -102,7 +102,7 @@ void SyncError::PrintLogError() const {
|
| location_->line_number(),
|
| logging::LOG_ERROR).stream(),
|
| LOG_IS_ON(ERROR))
|
| - << syncer::ModelTypeToString(type_) << ", Sync Error: " << message_;
|
| + << ModelTypeToString(type_) << ", Sync Error: " << message_;
|
| }
|
|
|
| void PrintTo(const SyncError& sync_error, std::ostream* os) {
|
|
|