| Index: chrome/browser/sync/sessions/status_controller.h
|
| diff --git a/chrome/browser/sync/sessions/status_controller.h b/chrome/browser/sync/sessions/status_controller.h
|
| index 329871f5d5988be324a84b9f0585b16e706c9ff7..a12bee87e8fd6074a47a9f00dbb75c464e9e67c0 100644
|
| --- a/chrome/browser/sync/sessions/status_controller.h
|
| +++ b/chrome/browser/sync/sessions/status_controller.h
|
| @@ -103,8 +103,8 @@ class StatusController {
|
| }
|
|
|
| // Errors and SyncerStatus.
|
| - const ErrorCounters& error_counters() const {
|
| - return shared_.error_counters.value();
|
| + const ErrorCounters& error() const {
|
| + return shared_.error.value();
|
| }
|
| const SyncerStatus& syncer_status() const {
|
| return shared_.syncer_status.value();
|
| @@ -229,6 +229,7 @@ class StatusController {
|
| void set_unsynced_handles(const std::vector<int64>& unsynced_handles);
|
| void increment_num_local_overwrites();
|
| void increment_num_server_overwrites();
|
| + void set_sync_protocol_error(const SyncProtocolError& error);
|
|
|
| void set_commit_set(const OrderedCommitSet& commit_set);
|
| void update_conflict_sets_built(bool built);
|
|
|