Force TalkMediator::Logout to wait until the Login task has been destroyed an...

chrome/browser/sync/engine/syncapi.cc

 // Copyright (c) 2006-2009 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 "chrome/browser/sync/engine/syncapi.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ skipping 1467 matching lines @@
     auth_watcher_->Shutdown();
     auth_watcher_ = NULL;
   }
 
   if (syncer_thread()) {
     if (!syncer_thread()->Stop(kThreadExitTimeoutMsec))
       DCHECK(false) << "Unable to stop the syncer, it won't be happy...";
   }
 
   // Shutdown the xmpp buzz connection.
-  LOG(INFO) << "P2P: Mediator logout started.";
   if (talk_mediator()) {
+    LOG(INFO) << "P2P: Mediator logout started.";
     talk_mediator()->Logout();
+    LOG(INFO) << "P2P: Mediator logout completed.";
+    talk_mediator_.reset();
+    LOG(INFO) << "P2P: Mediator destroyed.";
   }
-  LOG(INFO) << "P2P: Mediator logout completed.";
 
   if (dir_manager()) {
     dir_manager()->FinalSaveChangesForAll();
     dir_manager()->Close(username_for_share());
   }
 
   // Reset the DirectoryManager and UserSettings so they relinquish sqlite
   // handles to backing files.
   share_.dir_manager.reset();
   user_settings_.reset();
@@ skipping 392 matching lines @@
 BaseTransaction::~BaseTransaction() {
   delete lookup_;
 }
 
 UserShare* SyncManager::GetUserShare() const {
   DCHECK(data_->initialized()) << "GetUserShare requires initialization!";
   return data_->GetUserShare();
 }
 
 }  // namespace sync_api