Avoid double registration with content settings in account reconcilor.

components/signin/core/browser/account_reconcilor.h

 // 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.
 #ifndef COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_
 #define COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_
 
 #include <deque>
 #include <functional>
 #include <set>
 #include <string>
@@ skipping 175 matching lines @@
   // The SigninManager associated with this reconcilor.
   SigninManagerBase* signin_manager_;
 
   // The SigninClient associated with this reconcilor.
   SigninClient* client_;
 
   MergeSessionHelper merge_session_helper_;
   scoped_ptr<GaiaAuthFetcher> gaia_fetcher_;
   bool registered_with_token_service_;
   bool registered_with_merge_session_helper_;
+  bool registered_with_content_settings_;
 
   // True while the reconcilor is busy checking or managing the accounts in
   // this profile.
   bool is_reconcile_started_;
   base::Time m_reconcile_start_time_;
 
   // True iff this is the first time the reconcilor is executing.
   bool first_execution_;
 
   // Used during reconcile action.
@@ skipping 14 matching lines @@
 
   std::deque<GetAccountsFromCookieCallback> get_gaia_accounts_callbacks_;
 
   scoped_ptr<SigninClient::CookieChangedSubscription>
       cookie_changed_subscription_;
 
   DISALLOW_COPY_AND_ASSIGN(AccountReconcilor);
 };
 
 #endif  // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_