| 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 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_INTEGRATION_TEST_UTIL_H_ | 5 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_INTEGRATION_TEST_UTIL_H_ |
| 6 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_INTEGRATION_TEST_UTIL_H_ | 6 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_INTEGRATION_TEST_UTIL_H_ |
| 7 | 7 |
| 8 #include "components/sync/base/model_type.h" | 8 #include "components/sync/base/model_type.h" |
| 9 | 9 |
| 10 namespace browser_sync { |
| 10 class ProfileSyncService; | 11 class ProfileSyncService; |
| 12 } // namespace browser_sync |
| 11 | 13 |
| 12 namespace fake_server { | 14 namespace fake_server { |
| 13 class FakeServer; | 15 class FakeServer; |
| 14 } // namespace fake_server | 16 } // namespace fake_server |
| 15 | 17 |
| 16 namespace sync_integration_test_util { | 18 namespace sync_integration_test_util { |
| 17 | 19 |
| 18 // Wait until the provided |service| is blocked waiting for a passphrase. | 20 // Wait until the provided |service| is blocked waiting for a passphrase. |
| 19 bool AwaitPassphraseRequired(ProfileSyncService* service); | 21 bool AwaitPassphraseRequired(browser_sync::ProfileSyncService* service); |
| 20 | 22 |
| 21 // Wait until the provided |service| has accepted the new passphrase. | 23 // Wait until the provided |service| has accepted the new passphrase. |
| 22 bool AwaitPassphraseAccepted(ProfileSyncService* service); | 24 bool AwaitPassphraseAccepted(browser_sync::ProfileSyncService* service); |
| 23 | 25 |
| 24 // Wait until the |service| is fully synced. | 26 // Wait until the |service| is fully synced. |
| 25 // This can be a bit flaky. See UpdatedProgressMarkerChecker for details. | 27 // This can be a bit flaky. See UpdatedProgressMarkerChecker for details. |
| 26 bool AwaitCommitActivityCompletion(ProfileSyncService* service); | 28 bool AwaitCommitActivityCompletion(browser_sync::ProfileSyncService* service); |
| 27 | 29 |
| 28 // Wait until the fake server has a specific count for the given type. | 30 // Wait until the fake server has a specific count for the given type. |
| 29 bool AwaitServerCount(syncer::ModelType type, size_t count); | 31 bool AwaitServerCount(syncer::ModelType type, size_t count); |
| 30 | 32 |
| 31 } // namespace sync_integration_test_util | 33 } // namespace sync_integration_test_util |
| 32 | 34 |
| 33 #endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_INTEGRATION_TEST_UTIL_H_ | 35 #endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_INTEGRATION_TEST_UTIL_H_ |
| OLD | NEW |