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

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

Issue 2388673002: Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co (Closed)
Patch Set: Created 4 years, 2 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/profile_sync_service_harness.h
diff --git a/chrome/browser/sync/test/integration/profile_sync_service_harness.h b/chrome/browser/sync/test/integration/profile_sync_service_harness.h
index 087138d3cc837cf2509f22ce7cd34dd2c2f5e0ff..26c3db691970f6de04ffe74f05ab6849f78296ec 100644
--- a/chrome/browser/sync/test/integration/profile_sync_service_harness.h
+++ b/chrome/browser/sync/test/integration/profile_sync_service_harness.h
@@ -5,7 +5,6 @@
#ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_PROFILE_SYNC_SERVICE_HARNESS_H_
#define CHROME_BROWSER_SYNC_TEST_INTEGRATION_PROFILE_SYNC_SERVICE_HARNESS_H_
-#include <memory>
#include <string>
#include <vector>
@@ -20,9 +19,9 @@ namespace browser_sync {
class ProfileSyncService;
} // namespace browser_sync
-namespace syncer {
+namespace sync_driver {
class SyncSetupInProgressHandle;
-} // namespace syncer
+} // namespace sync_driver
// An instance of this class is basically our notion of a "sync client" for
// automation purposes. It harnesses the ProfileSyncService member of the
@@ -89,7 +88,7 @@ class ProfileSyncServiceHarness {
bool AwaitBackendInitialization();
// Blocks the caller until sync setup is complete. Returns true if and only
- // if sync setup completed successfully. See syncer::SyncService's
+ // if sync setup completed successfully. See sync_driver::SyncService's
// IsSyncActive() method for the definition of what successful means here.
bool AwaitSyncSetupCompletion();
@@ -149,7 +148,7 @@ class ProfileSyncServiceHarness {
browser_sync::ProfileSyncService* service_;
// Prevents Sync from running until configuration is complete.
- std::unique_ptr<syncer::SyncSetupInProgressHandle> sync_blocker_;
+ std::unique_ptr<sync_driver::SyncSetupInProgressHandle> sync_blocker_;
// Credentials used for GAIA authentication.
std::string username_;

Powered by Google App Engine
This is Rietveld 408576698