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

Unified Diff: chrome/browser/sync/test/integration/multi_client_status_change_checker.h

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/multi_client_status_change_checker.h
diff --git a/chrome/browser/sync/test/integration/multi_client_status_change_checker.h b/chrome/browser/sync/test/integration/multi_client_status_change_checker.h
index fc7db1ab4c2375072daeed9688b18b824b684937..49c7a2657adb19963b2da08b4f617c83e5b28b47 100644
--- a/chrome/browser/sync/test/integration/multi_client_status_change_checker.h
+++ b/chrome/browser/sync/test/integration/multi_client_status_change_checker.h
@@ -12,7 +12,9 @@
#include "chrome/browser/sync/test/integration/status_change_checker.h"
#include "components/sync/driver/sync_service_observer.h"
+namespace browser_sync {
class ProfileSyncService;
+} // namespace browser_sync
// This class provides some common functionality for StatusChangeCheckers that
// observe many ProfileSyncServices. This class is abstract. Its descendants
@@ -21,7 +23,7 @@ class MultiClientStatusChangeChecker : public StatusChangeChecker,
public sync_driver::SyncServiceObserver {
public:
explicit MultiClientStatusChangeChecker(
- std::vector<ProfileSyncService*> services);
+ std::vector<browser_sync::ProfileSyncService*> services);
~MultiClientStatusChangeChecker() override;
// Called when waiting times out.
@@ -38,10 +40,12 @@ class MultiClientStatusChangeChecker : public StatusChangeChecker,
std::string GetDebugMessage() const override = 0;
protected:
- const std::vector<ProfileSyncService*>& services() { return services_; }
+ const std::vector<browser_sync::ProfileSyncService*>& services() {
+ return services_;
+ }
private:
- std::vector<ProfileSyncService*> services_;
+ std::vector<browser_sync::ProfileSyncService*> services_;
};
#endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_MULTI_CLIENT_STATUS_CHANGE_CHECKER_H_

Powered by Google App Engine
This is Rietveld 408576698