Avoid double registration with content settings in account reconcilor.

components/signin/core/browser/account_reconcilor.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/account_reconcilor.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
@@ skipping 47 matching lines @@
                                      SigninClient* client)
     : token_service_(token_service),
       signin_manager_(signin_manager),
       client_(client),
       merge_session_helper_(token_service_,
                             GaiaConstants::kReconcilorSource,
                             client->GetURLRequestContext(),
                             NULL),
       registered_with_token_service_(false),
       registered_with_merge_session_helper_(false),
+      registered_with_content_settings_(false),
       is_reconcile_started_(false),
       first_execution_(true),
       are_gaia_accounts_set_(false),
       chrome_accounts_changed_(false) {
   VLOG(1) << "AccountReconcilor::AccountReconcilor";
 }
 
 AccountReconcilor::~AccountReconcilor() {
   VLOG(1) << "AccountReconcilor::~AccountReconcilor";
   // Make sure shutdown was called first.
@@ skipping 59 matching lines @@
 
 void AccountReconcilor::RegisterWithSigninManager() {
   signin_manager_->AddObserver(this);
 }
 
 void AccountReconcilor::UnregisterWithSigninManager() {
   signin_manager_->RemoveObserver(this);
 }
 
 void AccountReconcilor::RegisterWithContentSettings() {
+  VLOG(1) << "AccountReconcilor::RegisterWithContentSettings";
+  // During re-auth, the reconcilor will get a callback about successful signin
+  // even when the profile is already connected.  Avoid re-registering
+  // with the token service since this will DCHECK.
+  if (registered_with_content_settings_)
+    return;
+
   client_->AddContentSettingsObserver(this);
+  registered_with_content_settings_ = true;
 }
 
 void AccountReconcilor::UnregisterWithContentSettings() {
+  VLOG(1) << "AccountReconcilor::UnregisterWithContentSettings";
+  if (!registered_with_content_settings_)
+    return;
+
   client_->RemoveContentSettingsObserver(this);
+  registered_with_content_settings_ = false;
 }
 
 void AccountReconcilor::RegisterWithTokenService() {
   VLOG(1) << "AccountReconcilor::RegisterWithTokenService";
   // During re-auth, the reconcilor will get a callback about successful signin
   // even when the profile is already connected.  Avoid re-registering
   // with the token service since this will DCHECK.
   if (registered_with_token_service_)
     return;
 
@@ skipping 380 matching lines @@
 
 void AccountReconcilor::GetCheckConnectionInfoCompleted(bool succeeded) {
   base::TimeDelta time_to_check_connections =
       base::Time::Now() - m_reconcile_start_time_;
   signin_metrics::LogExternalCcResultFetches(succeeded,
                                              time_to_check_connections);
   GetAccountsFromCookie(base::Bind(
       &AccountReconcilor::ContinueReconcileActionAfterGetGaiaAccounts,
       base::Unretained(this)));
 }