| Index: sync/api/sync_error.h
|
| diff --git a/sync/api/sync_error.h b/sync/api/sync_error.h
|
| index 0e3a3c96d11f577ebfc996fbc543b4ca359fab00..657c17d4783dcb4e9f5695cbbefa53c6c26ed748 100644
|
| --- a/sync/api/sync_error.h
|
| +++ b/sync/api/sync_error.h
|
| @@ -33,7 +33,7 @@ class SyncError {
|
| // Will print the new error to LOG(ERROR).
|
| SyncError(const tracked_objects::Location& location,
|
| const std::string& message,
|
| - syncable::ModelType type);
|
| + syncer::ModelType type);
|
|
|
| // Copy and assign via deep copy.
|
| SyncError(const SyncError& other);
|
| @@ -46,7 +46,7 @@ class SyncError {
|
| // Will print the new error to LOG(ERROR).
|
| void Reset(const tracked_objects::Location& location,
|
| const std::string& message,
|
| - syncable::ModelType type);
|
| + syncer::ModelType type);
|
|
|
| // Whether this is a valid error or not.
|
| bool IsSet() const;
|
| @@ -54,7 +54,7 @@ class SyncError {
|
| // These must only be called if IsSet() is true.
|
| const tracked_objects::Location& location() const;
|
| const std::string& message() const;
|
| - syncable::ModelType type() const;
|
| + syncer::ModelType type() const;
|
|
|
| // Returns empty string is IsSet() is false.
|
| std::string ToString() const;
|
| @@ -70,7 +70,7 @@ class SyncError {
|
| // is called, IsSet() will return true.
|
| void Init(const tracked_objects::Location& location,
|
| const std::string& message,
|
| - syncable::ModelType type);
|
| + syncer::ModelType type);
|
|
|
| // Reset the error to it's default (unset) values.
|
| void Clear();
|
| @@ -78,7 +78,7 @@ class SyncError {
|
| // scoped_ptr is necessary because Location objects aren't assignable.
|
| scoped_ptr<tracked_objects::Location> location_;
|
| std::string message_;
|
| - syncable::ModelType type_;
|
| + syncer::ModelType type_;
|
| };
|
|
|
| // gmock printer helper.
|
|
|