| Index: chrome/browser/sync/test/integration/sync_errors_test.cc
|
| diff --git a/chrome/browser/sync/test/integration/sync_errors_test.cc b/chrome/browser/sync/test/integration/sync_errors_test.cc
|
| index 6fe399fcbc8cb1905bdfd7bc2f5a839a5db368af..8faa8980297a65696efe1599d8abbf520c03cc99 100644
|
| --- a/chrome/browser/sync/test/integration/sync_errors_test.cc
|
| +++ b/chrome/browser/sync/test/integration/sync_errors_test.cc
|
| @@ -27,12 +27,12 @@ class SyncDisabledChecker : public SingleClientStatusChangeChecker {
|
| explicit SyncDisabledChecker(ProfileSyncService* service)
|
| : SingleClientStatusChangeChecker(service) {}
|
|
|
| - virtual bool IsExitConditionSatisfied() OVERRIDE {
|
| + virtual bool IsExitConditionSatisfied() override {
|
| return !service()->setup_in_progress() &&
|
| !service()->HasSyncSetupCompleted();
|
| }
|
|
|
| - virtual std::string GetDebugMessage() const OVERRIDE {
|
| + virtual std::string GetDebugMessage() const override {
|
| return "Sync Disabled";
|
| }
|
| };
|
| @@ -43,11 +43,11 @@ class TypeDisabledChecker : public SingleClientStatusChangeChecker {
|
| syncer::ModelType type)
|
| : SingleClientStatusChangeChecker(service), type_(type) {}
|
|
|
| - virtual bool IsExitConditionSatisfied() OVERRIDE {
|
| + virtual bool IsExitConditionSatisfied() override {
|
| return !service()->GetActiveDataTypes().Has(type_);
|
| }
|
|
|
| - virtual std::string GetDebugMessage() const OVERRIDE {
|
| + virtual std::string GetDebugMessage() const override {
|
| return "Type disabled";
|
| }
|
| private:
|
| @@ -97,14 +97,14 @@ class ActionableErrorChecker : public SingleClientStatusChangeChecker {
|
|
|
| // Checks if an actionable error has been hit. Called repeatedly each time PSS
|
| // notifies observers of a state change.
|
| - virtual bool IsExitConditionSatisfied() OVERRIDE {
|
| + virtual bool IsExitConditionSatisfied() override {
|
| ProfileSyncService::Status status;
|
| service()->QueryDetailedSyncStatus(&status);
|
| return (status.sync_protocol_error.action != syncer::UNKNOWN_ACTION &&
|
| service()->HasUnrecoverableError());
|
| }
|
|
|
| - virtual std::string GetDebugMessage() const OVERRIDE {
|
| + virtual std::string GetDebugMessage() const override {
|
| return "ActionableErrorChecker";
|
| }
|
|
|
|
|