Fix race condition disconnecting hosts.

remoting/host/it2me_host_user_interface.h

 // Copyright (c) 2011 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.
 
 #ifndef REMOTING_HOST_IT2ME_HOST_USER_INTERFACE_H_
 #define REMOTING_HOST_IT2ME_HOST_USER_INTERFACE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/synchronization/waitable_event.h"
 
 #include "remoting/base/scoped_thread_proxy.h"
 #include "remoting/host/host_status_observer.h"
 
 // Milliseconds before the continue window is shown.
 static const int kContinueWindowShowTimeoutMs = 10 * 60 * 1000;
 
 // Milliseconds before the continue window is automatically dismissed and
 // the connection is closed.
 static const int kContinueWindowHideTimeoutMs = 60 * 1000;
@@ skipping 37 matching lines @@
   // Allow ChromotingHostTest::SetUp() to call InitFrom().
   friend class ChromotingHostTest;
 
   // Used by unit-tests as an alternative to Init() so that mock versions of
   // internal objects can be used.  This takes ownership of all objects passed
   // in.
   void InitFrom(DisconnectWindow* disconnect_window,
                 ContinueWindow* continue_window,
                 LocalInputMonitor* monitor);
 
-  void OnConnect(const std::string& username);
-  void OnLastDisconnect();
-
-  void ProcessOnConnect(const std::string& username);
-  void ProcessOnLastDisconnect();
+  void ProcessOnClientAuthenticated(const std::string& username);
+  void ProcessOnClientDisconnected();
 
   void MonitorLocalInputs(bool enable);
 
   // Show or hide the Disconnect window on the UI thread.  If |show| is false,
   // hide the window, ignoring the |username| parameter.
   void ShowDisconnectWindow(bool show, const std::string& username);
 
   // Show or hide the Continue Sharing window on the UI thread.
   void ShowContinueWindow(bool show);
 
@@ skipping 27 matching lines @@
 
   // Timer controlling the "continue session" dialog.
   scoped_ptr<TimerTask> timer_task_;
 
   ScopedThreadProxy ui_thread_proxy_;
 
   // The JID of the currently-authenticated user (or an empty string if no user
   // is connected).
   std::string authenticated_jid_;
 
+  // Event to allow the On* callbacks to block until their counterparts on the
+  // UI thread have completed.
+  base::WaitableEvent callback_complete_;
+
   DISALLOW_COPY_AND_ASSIGN(It2MeHostUserInterface);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_IT2ME_HOST_USER_INTERFACE_H_