Cleanup client shutdown sequence.

BUG=None
TEST=Client doesn't crash when reloading the tab.

Review URL: http://codereview.chromium.org/7241016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90443 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 4 deletions

diff --git a/remoting/client/chromoting_client.cc b/remoting/client/chromoting_client.cc
index 8161089..d7eee8e 100644
--- a/remoting/client/chromoting_client.cc
+++ b/remoting/client/chromoting_client.cc
@@ -4,6 +4,7 @@
 
 #include "remoting/client/chromoting_client.h"
 
+#include "base/bind.h"
 #include "base/message_loop.h"
 #include "remoting/base/tracer.h"
 #include "remoting/client/chromoting_view.h"
@@ -57,17 +58,22 @@ void ChromotingClient::Start(scoped_refptr<XmppProxy> xmpp_proxy) {
   }
 }
 
-void ChromotingClient::Stop() {
+void ChromotingClient::Stop(const base::Closure& shutdown_task) {
   if (message_loop() != MessageLoop::current()) {
     message_loop()->PostTask(
-        FROM_HERE,
-        NewRunnableMethod(this, &ChromotingClient::Stop));
+        FROM_HERE, base::Bind(&ChromotingClient::Stop,
+                              base::Unretained(this), shutdown_task));
     return;
   }
 
-  connection_->Disconnect();
+  connection_->Disconnect(base::Bind(&ChromotingClient::OnDisconnected,
+                                     base::Unretained(this), shutdown_task));
+}
 
+void ChromotingClient::OnDisconnected(const base::Closure& shutdown_task) {
   view_->TearDown();
+
+  shutdown_task.Run();
 }
 
 void ChromotingClient::ClientDone() {