| Index: chrome/browser/sync/sync_startup_tracker.cc
|
| diff --git a/chrome/browser/sync/sync_startup_tracker.cc b/chrome/browser/sync/sync_startup_tracker.cc
|
| index c7db49bdfead440159fb77ea407676a3b3d0cec8..d65454b4058901ffa1042e143634f3c1db2e80e9 100644
|
| --- a/chrome/browser/sync/sync_startup_tracker.cc
|
| +++ b/chrome/browser/sync/sync_startup_tracker.cc
|
| @@ -11,8 +11,8 @@
|
| SyncStartupTracker::SyncStartupTracker(Profile* profile, Observer* observer)
|
| : profile_(profile),
|
| observer_(observer) {
|
| - ProfileSyncService* service = ProfileSyncServiceFactory::GetForProfile(
|
| - profile_);
|
| + browser_sync::ProfileSyncService* service =
|
| + ProfileSyncServiceFactory::GetForProfile(profile_);
|
| if (service)
|
| service->AddObserver(this);
|
|
|
| @@ -20,8 +20,8 @@ SyncStartupTracker::SyncStartupTracker(Profile* profile, Observer* observer)
|
| }
|
|
|
| SyncStartupTracker::~SyncStartupTracker() {
|
| - ProfileSyncService* service = ProfileSyncServiceFactory::GetForProfile(
|
| - profile_);
|
| + browser_sync::ProfileSyncService* service =
|
| + ProfileSyncServiceFactory::GetForProfile(profile_);
|
| if (service)
|
| service->RemoveObserver(this);
|
| }
|
| @@ -53,7 +53,7 @@ SyncStartupTracker::SyncServiceState SyncStartupTracker::GetSyncServiceState(
|
| if (!profile->IsSyncAllowed())
|
| return SYNC_STARTUP_ERROR;
|
|
|
| - ProfileSyncService* service =
|
| + browser_sync::ProfileSyncService* service =
|
| ProfileSyncServiceFactory::GetForProfile(profile);
|
|
|
| // If no service exists or it can't be started, treat as a startup error.
|
|
|