diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/sync/profile_sync_service.h | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/sync/profile_sync_service.h')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h index c96799b..65f18f5 100644 --- a/chrome/browser/sync/profile_sync_service.h +++ b/chrome/browser/sync/profile_sync_service.h @@ -172,7 +172,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend, // Whether sync is enabled by user or not. virtual bool HasSyncSetupCompleted() const; - void SetSyncSetupCompleted(); + virtual void SetSyncSetupCompleted(); // SyncFrontend implementation. virtual void OnBackendInitialized(); @@ -355,6 +355,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend, const GURL& sync_service_url() const { return sync_service_url_; } + SigninManager* signin() { return &signin_; } protected: // Used by ProfileSyncServiceMock only. // @@ -407,7 +408,6 @@ class ProfileSyncService : public browser_sync::SyncFrontend, friend class ProfileSyncServicePasswordTest; friend class ProfileSyncServicePreferenceTest; friend class ProfileSyncServiceSessionTest; - friend class ProfileSyncServiceTestHarness; FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceTest, InitialState); FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceTest, UnrecoverableErrorSuspendsService); |