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

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

Issue 2354613002: [Sync] Fix namespaces for the browser_sync component. (Closed)
Patch Set: Self-review. 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/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 2acade8120589d2457bee1f2c344e9bccc32a091..1fc05ba85574a312f720a748b15a478ad1087737 100644
--- a/chrome/browser/sync/test/integration/profile_sync_service_harness.h
+++ b/chrome/browser/sync/test/integration/profile_sync_service_harness.h
@@ -14,7 +14,10 @@
#include "components/sync/engine/cycle/sync_cycle_snapshot.h"
class Profile;
+
+namespace browser_sync {
class ProfileSyncService;
+}
skym 2016/09/22 17:25:58 Again, closing namespace comment?
maxbogue 2016/09/22 19:41:14 Done.
namespace sync_driver {
class SyncSetupInProgressHandle;
@@ -90,7 +93,7 @@ class ProfileSyncServiceHarness {
bool AwaitSyncSetupCompletion();
// Returns the ProfileSyncService member of the sync client.
- ProfileSyncService* service() const { return service_; }
+ browser_sync::ProfileSyncService* service() const { return service_; }
// Returns the debug name for this profile. Used for logging.
const std::string& profile_debug_name() const { return profile_debug_name_; }
@@ -142,7 +145,7 @@ class ProfileSyncServiceHarness {
Profile* profile_;
// ProfileSyncService object associated with |profile_|.
- ProfileSyncService* service_;
+ browser_sync::ProfileSyncService* service_;
// Prevents Sync from running until configuration is complete.
std::unique_ptr<sync_driver::SyncSetupInProgressHandle> sync_blocker_;

Powered by Google App Engine
This is Rietveld 408576698