| 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 5ce0aab0a24de3b014a37d4105b8f46fdaed1774..f54739105a8466d37af75fde68fe8c83b939f8ac 100644
|
| --- a/chrome/browser/signin/fake_signin_manager.h
|
| +++ b/chrome/browser/signin/fake_signin_manager.h
|
| @@ -62,6 +62,16 @@ class FakeSigninManager : public SigninManager {
|
| virtual void SignOut() 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)
|
|
|