SigninManager owns ObserverList for the MergeSessionHelper.

components/signin/core/browser/signin_manager.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/signin/core/browser/signin_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/metrics/histogram.h"
@@ skipping 56 matching lines @@
       type_(SIGNIN_TYPE_NONE),
       client_(client),
       token_service_(token_service),
       account_tracker_service_(account_tracker_service),
       signin_manager_signed_in_(false),
       user_info_fetched_by_account_tracker_(false),
       weak_pointer_factory_(this) {}
 
 void SigninManager::AddMergeSessionObserver(
     MergeSessionHelper::Observer* observer) {
-  if (merge_session_helper_)
-    merge_session_helper_->AddObserver(observer);
+  merge_session_observer_list_.AddObserver(observer);
 }
 
 void SigninManager::RemoveMergeSessionObserver(
     MergeSessionHelper::Observer* observer) {
-  if (merge_session_helper_)
-    merge_session_helper_->RemoveObserver(observer);
+  merge_session_observer_list_.RemoveObserver(observer);
+}
+
+void SigninManager::MergeSessionCompleted(const std::string& account_id,
+                                          const GoogleServiceAuthError& error) {
+  FOR_EACH_OBSERVER(MergeSessionHelper::Observer, merge_session_observer_list_,
+                    MergeSessionCompleted(account_id, error));
+}
+
+void SigninManager::GetCheckConnectionInfoCompleted(bool succeeded) {
+  FOR_EACH_OBSERVER(MergeSessionHelper::Observer, merge_session_observer_list_,
+                    GetCheckConnectionInfoCompleted(succeeded));
 }
 
 SigninManager::~SigninManager() {}
 
 void SigninManager::InitTokenService() {
   if (token_service_ && IsAuthenticated())
     token_service_->LoadCredentials(GetAuthenticatedAccountId());
 }
 
 std::string SigninManager::SigninTypeToString(SigninManager::SigninType type) {
@@ skipping 173 matching lines @@
 
   InitTokenService();
   account_id_helper_.reset(
       new SigninAccountIdHelper(client_, token_service_, this));
 
   account_tracker_service_->AddObserver(this);
 }
 
 void SigninManager::Shutdown() {
   account_tracker_service_->RemoveObserver(this);
-  if (merge_session_helper_)
+  if (merge_session_helper_) {
     merge_session_helper_->CancelAll();
+    merge_session_helper_->RemoveObserver(this);
+  }
 
   local_state_pref_registrar_.RemoveAll();
   account_id_helper_.reset();
   SigninManagerBase::Shutdown();
 }
 
 void SigninManager::OnGoogleServicesUsernamePatternChanged() {
   if (IsAuthenticated() &&
       !IsAllowedUsername(GetAuthenticatedUsername())) {
     // Signed in user is invalid according to the current policy so sign
@@ skipping 66 matching lines @@
   prefs->SetBoolean(prefs::kReverseAutologinEnabled, false);
 }
 
 void SigninManager::MergeSigninCredentialIntoCookieJar() {
   if (!client_->ShouldMergeSigninCredentialsIntoCookieJar())
     return;
 
   if (!IsAuthenticated())
     return;
 
-  // Don't execute 2 MergeSessionHelpers. New account takes priority.
-  if (merge_session_helper_.get() && merge_session_helper_->is_running())
-    merge_session_helper_->CancelAll();
+  // Don't execute two MergeSessionHelpers. New account takes priority.
+  if (merge_session_helper_) {
+    if (merge_session_helper_->is_running())
+      merge_session_helper_->CancelAll();
+    merge_session_helper_->RemoveObserver(this);
+  }
 
   merge_session_helper_.reset(new MergeSessionHelper(
       token_service_, GaiaConstants::kChromeSource,
-      client_->GetURLRequestContext(), NULL));
+      client_->GetURLRequestContext(), this));
 
   merge_session_helper_->LogIn(GetAuthenticatedAccountId());
 }
 
 void SigninManager::CompletePendingSignin() {
   DCHECK(!possibly_invalid_username_.empty());
   OnSignedIn(possibly_invalid_username_);
 
   DCHECK(!temp_refresh_token_.empty());
   DCHECK(IsAuthenticated());
@@ skipping 53 matching lines @@
 void SigninManager::OnAccountUpdateFailed(const std::string& account_id) {
   user_info_fetched_by_account_tracker_ = true;
   PostSignedIn();
 }
 
 void SigninManager::ProhibitSignout(bool prohibit_signout) {
   prohibit_signout_ = prohibit_signout;
 }
 
 bool SigninManager::IsSignoutProhibited() const { return prohibit_signout_; }