summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync
diff options
context:
space:
mode:
authortim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-01 17:43:57 +0000
committertim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-01 17:43:57 +0000
commitf2664c916bb25862badcb64fa19e8f616d5b02c3 (patch)
tree0e9b2ad8762cc4038e17726352250daf6e8f1fba /chrome/browser/sync
parent6a7fb04b7475b355cb571c9aca6b192d2a96ca5f (diff)
downloadchromium_src-f2664c916bb25862badcb64fa19e8f616d5b02c3.zip
chromium_src-f2664c916bb25862badcb64fa19e8f616d5b02c3.tar.gz
chromium_src-f2664c916bb25862badcb64fa19e8f616d5b02c3.tar.bz2
Speculative fix for thread sanitizer failures in ProfileSyncServiceTest.
We should not raise an "auth needed" event if we're not supposed to attempt auth in the first place. TBR=albertb Review URL: http://codereview.chromium.org/549222 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37700 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
-rwxr-xr-xchrome/browser/sync/engine/syncapi.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc
index 4de9587..c60df3d 100755
--- a/chrome/browser/sync/engine/syncapi.cc
+++ b/chrome/browser/sync/engine/syncapi.cc
@@ -1204,7 +1204,7 @@ bool SyncManager::SyncInternal::Init(
attempting_auth = true;
AuthenticateWithLsid(lsid);
}
- if (!attempting_auth)
+ if (attempt_last_user_authentication && !attempting_auth)
RaiseAuthNeededEvent();
return true;
}