summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorrogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-23 06:51:54 +0000
committerrogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-23 06:51:54 +0000
commitf2ddf768f222827ee2cd409b936a12e73b4d17c3 (patch)
treea8914ef5144fe13e43f3a573e0eaec147f47e3bb /components
parent66d3381b11504826ebbc562339ef45c58e545e71 (diff)
downloadchromium_src-f2ddf768f222827ee2cd409b936a12e73b4d17c3.zip
chromium_src-f2ddf768f222827ee2cd409b936a12e73b4d17c3.tar.gz
chromium_src-f2ddf768f222827ee2cd409b936a12e73b4d17c3.tar.bz2
Clear list of pending /ListAccount callsbacks when shutting down or when
disconnecting the profile. BUG=373861 Review URL: https://codereview.chromium.org/298753009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272415 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components')
-rw-r--r--components/signin/core/browser/account_reconcilor.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/components/signin/core/browser/account_reconcilor.cc b/components/signin/core/browser/account_reconcilor.cc
index 4d7cf97..65c7370 100644
--- a/components/signin/core/browser/account_reconcilor.cc
+++ b/components/signin/core/browser/account_reconcilor.cc
@@ -237,6 +237,7 @@ void AccountReconcilor::Shutdown() {
merge_session_helper_.CancelAll();
merge_session_helper_.RemoveObserver(this);
gaia_fetcher_.reset();
+ get_gaia_accounts_callbacks_.clear();
DeleteFetchers();
UnregisterWithSigninManager();
UnregisterWithTokenService();
@@ -349,6 +350,7 @@ void AccountReconcilor::GoogleSigninSucceeded(const std::string& username,
void AccountReconcilor::GoogleSignedOut(const std::string& username) {
VLOG(1) << "AccountReconcilor::GoogleSignedOut: signed out";
gaia_fetcher_.reset();
+ get_gaia_accounts_callbacks_.clear();
AbortReconcile();
UnregisterWithTokenService();
UnregisterForCookieChanges();