| Index: chrome/browser/signin/fake_signin_manager.h
|
| diff --git a/chrome/browser/signin/fake_signin_manager.h b/chrome/browser/signin/fake_signin_manager.h
|
| index f491ac9c2240665f4a0c8de52b3abf4e31d8069a..88a18c5b26ca3551c3600d53283b6364ee0665ee 100644
|
| --- a/chrome/browser/signin/fake_signin_manager.h
|
| +++ b/chrome/browser/signin/fake_signin_manager.h
|
| @@ -64,16 +64,6 @@ class FakeSigninManager : public SigninManager {
|
| OVERRIDE;
|
|
|
| virtual void CompletePendingSignin() OVERRIDE;
|
| -
|
| - virtual void AddMergeSessionObserver(
|
| - MergeSessionHelper::Observer* observer) OVERRIDE;
|
| - virtual void RemoveMergeSessionObserver(
|
| - MergeSessionHelper::Observer* observer) OVERRIDE;
|
| -
|
| - void NotifyMergeSessionObservers(const GoogleServiceAuthError& error);
|
| -
|
| - private:
|
| - ObserverList<MergeSessionHelper::Observer, true> merge_session_observer_list_;
|
| };
|
|
|
| #endif // !defined (OS_CHROMEOS)
|
|
|