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

chrome/browser/sync/notifier/listener/mediator_thread_impl.h

Index: chrome/browser/sync/notifier/listener/mediator_thread_impl.h
===================================================================
--- chrome/browser/sync/notifier/listener/mediator_thread_impl.h	(revision 41596)
+++ chrome/browser/sync/notifier/listener/mediator_thread_impl.h	(working copy)
@@ -48,7 +48,8 @@
   CMD_DISCONNECT,
   CMD_LISTEN_FOR_UPDATES,
   CMD_SEND_NOTIFICATION,
-  CMD_SUBSCRIBE_FOR_UPDATES
+  CMD_SUBSCRIBE_FOR_UPDATES,
+  CMD_PUMP_AUXILIARY_LOOPS,
 };
 
 // Used to pass authentication information from the mediator to the thread.
@@ -73,6 +74,7 @@
 
   // Start the thread.
   virtual void Start();
+  virtual void Stop();
   virtual void Run();
 
   // These are called from outside threads, by the talk mediator object.
@@ -94,6 +96,7 @@
   void DoListenForUpdates();
   void DoSendNotification();
   void DoStanzaLogging();
+  void PumpAuxiliaryLoops();
 
   // These handle messages indicating an event happened in the outside world.
   void OnUpdateListenerMessage();