diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-09 20:45:15 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-09 20:45:15 +0000 |
| commit | 6d74eb4b244aaf5f68960565c11512ae4cea47f5 (patch) | |
| tree | 1c198a3a2e7451b035255277b388a3feefbde1a9 /chrome | |
| parent | 71aa1a2bcdbb64adb2d5415c55e3885e760e9bee (diff) | |
| download | chromium_src-6d74eb4b244aaf5f68960565c11512ae4cea47f5.zip chromium_src-6d74eb4b244aaf5f68960565c11512ae4cea47f5.tar.gz chromium_src-6d74eb4b244aaf5f68960565c11512ae4cea47f5.tar.bz2 | |
Revert 40521 - Fix attempt for bug 34158. Reset the TalkMediator after calling Logout to ensure it is destroyed from the
core thread. This ensures the task to destroy the GaiaAuth object is run on
the core thread and not the UI thread.
Fred and I debugged this together and actually saw a second crash appear to result
from this change, but then we did a clean build and were unable to repro that crash,
so I think this as a net win at the moment.
BUG=34158,37771
Review URL: http://codereview.chromium.org/660437
TBR=akalin@chromium.org
Review URL: http://codereview.chromium.org/738002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41071 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/sync/engine/syncapi.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc index 7027453..a7718d8 100644 --- a/chrome/browser/sync/engine/syncapi.cc +++ b/chrome/browser/sync/engine/syncapi.cc @@ -953,9 +953,7 @@ class SyncManager::SyncInternal { initialized_(false) { } - ~SyncInternal() { - DCHECK(!talk_mediator_.get()); - } + ~SyncInternal() { } bool Init(const FilePath& database_location, const std::string& sync_server_and_path, @@ -1485,7 +1483,6 @@ void SyncManager::SyncInternal::Shutdown() { LOG(INFO) << "P2P: Mediator logout started."; if (talk_mediator()) { talk_mediator()->Logout(); - talk_mediator_.reset(); } LOG(INFO) << "P2P: Mediator logout completed."; |