Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2682)

Unified Diff: chrome/browser/sync/test/integration/sync_integration_test_util.cc

Issue 2354613002: [Sync] Fix namespaces for the browser_sync component. (Closed)
Patch Set: Address comments. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 8b901a27f2e63340bc7ed780774b24f3988990b4..53ed7ae6f476d75c50d2a261ba19d3dd3731c4cd 100644
--- a/chrome/browser/sync/test/integration/sync_integration_test_util.cc
+++ b/chrome/browser/sync/test/integration/sync_integration_test_util.cc
@@ -41,7 +41,7 @@ class ServerCountMatchStatusChecker
class PassphraseRequiredChecker : public SingleClientStatusChangeChecker {
public:
- explicit PassphraseRequiredChecker(ProfileSyncService* service)
+ explicit PassphraseRequiredChecker(browser_sync::ProfileSyncService* service)
: SingleClientStatusChangeChecker(service) {}
bool IsExitConditionSatisfied() override {
@@ -53,7 +53,7 @@ class PassphraseRequiredChecker : public SingleClientStatusChangeChecker {
class PassphraseAcceptedChecker : public SingleClientStatusChangeChecker {
public:
- explicit PassphraseAcceptedChecker(ProfileSyncService* service)
+ explicit PassphraseAcceptedChecker(browser_sync::ProfileSyncService* service)
: SingleClientStatusChangeChecker(service) {}
bool IsExitConditionSatisfied() override {
@@ -68,19 +68,19 @@ class PassphraseAcceptedChecker : public SingleClientStatusChangeChecker {
namespace sync_integration_test_util {
-bool AwaitPassphraseRequired(ProfileSyncService* service) {
+bool AwaitPassphraseRequired(browser_sync::ProfileSyncService* service) {
PassphraseRequiredChecker checker(service);
checker.Wait();
return !checker.TimedOut();
}
-bool AwaitPassphraseAccepted(ProfileSyncService* service) {
+bool AwaitPassphraseAccepted(browser_sync::ProfileSyncService* service) {
PassphraseAcceptedChecker checker(service);
checker.Wait();
return !checker.TimedOut();
}
-bool AwaitCommitActivityCompletion(ProfileSyncService* service) {
+bool AwaitCommitActivityCompletion(browser_sync::ProfileSyncService* service) {
UpdatedProgressMarkerChecker checker(service);
checker.Wait();
return !checker.TimedOut();
« no previous file with comments | « chrome/browser/sync/test/integration/sync_integration_test_util.h ('k') | chrome/browser/sync/test/integration/sync_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698