| Index: chrome/browser/sync/test/integration/sync_integration_test_util.cc
|
| diff --git a/chrome/browser/sync/test/integration/sync_integration_test_util.cc b/chrome/browser/sync/test/integration/sync_integration_test_util.cc
|
| index 4c4e8d335ff084cde8e0c1e311349c8b05599ef2..248d051cc4d4e6ab1087f28b3d3fc5bf5e6664a2 100644
|
| --- a/chrome/browser/sync/test/integration/sync_integration_test_util.cc
|
| +++ b/chrome/browser/sync/test/integration/sync_integration_test_util.cc
|
| @@ -15,13 +15,11 @@ class PassphraseRequiredChecker : public SingleClientStatusChangeChecker {
|
| explicit PassphraseRequiredChecker(ProfileSyncService* service)
|
| : SingleClientStatusChangeChecker(service) {}
|
|
|
| - virtual bool IsExitConditionSatisfied() override {
|
| + bool IsExitConditionSatisfied() override {
|
| return service()->IsPassphraseRequired();
|
| }
|
|
|
| - virtual std::string GetDebugMessage() const override {
|
| - return "Passhrase Required";
|
| - }
|
| + std::string GetDebugMessage() const override { return "Passhrase Required"; }
|
| };
|
|
|
| class PassphraseAcceptedChecker : public SingleClientStatusChangeChecker {
|
| @@ -29,14 +27,12 @@ class PassphraseAcceptedChecker : public SingleClientStatusChangeChecker {
|
| explicit PassphraseAcceptedChecker(ProfileSyncService* service)
|
| : SingleClientStatusChangeChecker(service) {}
|
|
|
| - virtual bool IsExitConditionSatisfied() override {
|
| + bool IsExitConditionSatisfied() override {
|
| return !service()->IsPassphraseRequired() &&
|
| service()->IsUsingSecondaryPassphrase();
|
| }
|
|
|
| - virtual std::string GetDebugMessage() const override {
|
| - return "Passhrase Accepted";
|
| - }
|
| + std::string GetDebugMessage() const override { return "Passhrase Accepted"; }
|
| };
|
|
|
| bool AwaitPassphraseRequired(ProfileSyncService* service) {
|
|
|