| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" | 5 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" |
| 6 | 6 |
| 7 #include "chrome/browser/sync/profile_sync_service.h" | 7 #include "chrome/browser/sync/profile_sync_service.h" |
| 8 #include "chrome/browser/sync/test/integration/single_client_status_change_check
er.h" | 8 #include "chrome/browser/sync/test/integration/single_client_status_change_check
er.h" |
| 9 #include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h
" | 9 #include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h
" |
| 10 | 10 |
| 11 namespace sync_integration_test_util { | 11 namespace sync_integration_test_util { |
| 12 | 12 |
| 13 class PassphraseRequiredChecker : public SingleClientStatusChangeChecker { | 13 class PassphraseRequiredChecker : public SingleClientStatusChangeChecker { |
| 14 public: | 14 public: |
| 15 explicit PassphraseRequiredChecker(ProfileSyncService* service) | 15 explicit PassphraseRequiredChecker(ProfileSyncService* service) |
| 16 : SingleClientStatusChangeChecker(service) {} | 16 : SingleClientStatusChangeChecker(service) {} |
| 17 | 17 |
| 18 virtual bool IsExitConditionSatisfied() override { | 18 bool IsExitConditionSatisfied() override { |
| 19 return service()->IsPassphraseRequired(); | 19 return service()->IsPassphraseRequired(); |
| 20 } | 20 } |
| 21 | 21 |
| 22 virtual std::string GetDebugMessage() const override { | 22 std::string GetDebugMessage() const override { return "Passhrase Required"; } |
| 23 return "Passhrase Required"; | |
| 24 } | |
| 25 }; | 23 }; |
| 26 | 24 |
| 27 class PassphraseAcceptedChecker : public SingleClientStatusChangeChecker { | 25 class PassphraseAcceptedChecker : public SingleClientStatusChangeChecker { |
| 28 public: | 26 public: |
| 29 explicit PassphraseAcceptedChecker(ProfileSyncService* service) | 27 explicit PassphraseAcceptedChecker(ProfileSyncService* service) |
| 30 : SingleClientStatusChangeChecker(service) {} | 28 : SingleClientStatusChangeChecker(service) {} |
| 31 | 29 |
| 32 virtual bool IsExitConditionSatisfied() override { | 30 bool IsExitConditionSatisfied() override { |
| 33 return !service()->IsPassphraseRequired() && | 31 return !service()->IsPassphraseRequired() && |
| 34 service()->IsUsingSecondaryPassphrase(); | 32 service()->IsUsingSecondaryPassphrase(); |
| 35 } | 33 } |
| 36 | 34 |
| 37 virtual std::string GetDebugMessage() const override { | 35 std::string GetDebugMessage() const override { return "Passhrase Accepted"; } |
| 38 return "Passhrase Accepted"; | |
| 39 } | |
| 40 }; | 36 }; |
| 41 | 37 |
| 42 bool AwaitPassphraseRequired(ProfileSyncService* service) { | 38 bool AwaitPassphraseRequired(ProfileSyncService* service) { |
| 43 PassphraseRequiredChecker checker(service); | 39 PassphraseRequiredChecker checker(service); |
| 44 checker.Wait(); | 40 checker.Wait(); |
| 45 return !checker.TimedOut(); | 41 return !checker.TimedOut(); |
| 46 } | 42 } |
| 47 | 43 |
| 48 bool AwaitPassphraseAccepted(ProfileSyncService* service) { | 44 bool AwaitPassphraseAccepted(ProfileSyncService* service) { |
| 49 PassphraseAcceptedChecker checker(service); | 45 PassphraseAcceptedChecker checker(service); |
| 50 checker.Wait(); | 46 checker.Wait(); |
| 51 return !checker.TimedOut(); | 47 return !checker.TimedOut(); |
| 52 } | 48 } |
| 53 | 49 |
| 54 bool AwaitCommitActivityCompletion(ProfileSyncService* service) { | 50 bool AwaitCommitActivityCompletion(ProfileSyncService* service) { |
| 55 UpdatedProgressMarkerChecker checker(service); | 51 UpdatedProgressMarkerChecker checker(service); |
| 56 checker.Wait(); | 52 checker.Wait(); |
| 57 return !checker.TimedOut(); | 53 return !checker.TimedOut(); |
| 58 } | 54 } |
| 59 | 55 |
| 60 } // namespace sync_integration_test_util | 56 } // namespace sync_integration_test_util |
| OLD | NEW |