| Index: chrome/browser/signin/fake_signin_manager.cc
|
| diff --git a/chrome/browser/signin/fake_signin_manager.cc b/chrome/browser/signin/fake_signin_manager.cc
|
| index 4c5f43f999de9a9332d66482a706161add07101e..a11a9a1437f3de1aabb591dad14572cb549b3995 100644
|
| --- a/chrome/browser/signin/fake_signin_manager.cc
|
| +++ b/chrome/browser/signin/fake_signin_manager.cc
|
| @@ -67,6 +67,24 @@ void FakeSigninManager::CompletePendingSignin() {
|
| GoogleSigninSucceeded(authenticated_username_, password_));
|
| }
|
|
|
| +void FakeSigninManager::AddMergeSessionObserver(
|
| + MergeSessionHelper::Observer* observer) {
|
| + SigninManager::AddMergeSessionObserver(observer);
|
| + merge_session_observer_list_.AddObserver(observer);
|
| +}
|
| +
|
| +void FakeSigninManager::RemoveMergeSessionObserver(
|
| + MergeSessionHelper::Observer* observer) {
|
| + SigninManager::RemoveMergeSessionObserver(observer);
|
| + merge_session_observer_list_.RemoveObserver(observer);
|
| +}
|
| +
|
| +void FakeSigninManager::NotifyMergeSessionObservers(
|
| + const GoogleServiceAuthError& error) {
|
| + FOR_EACH_OBSERVER(MergeSessionHelper::Observer, merge_session_observer_list_,
|
| + MergeSessionCompleted(GetAuthenticatedUsername(), error));
|
| +}
|
| +
|
| void FakeSigninManager::SignIn(const std::string& username,
|
| const std::string& password) {
|
| StartSignInWithRefreshToken(
|
|
|