diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-24 21:51:42 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-24 21:51:42 +0000 |
| commit | 9c910e4187919cbb2d0dccdb8e720de869dabd2f (patch) | |
| tree | 8791c509540b91971d63d6a22fa166de140d5a8c /remoting/protocol/protocol_test_client.cc | |
| parent | 5ee0a182a58cf59c24ccd485a0804e3f327ef412 (diff) | |
| download | chromium_src-9c910e4187919cbb2d0dccdb8e720de869dabd2f.zip chromium_src-9c910e4187919cbb2d0dccdb8e720de869dabd2f.tar.gz chromium_src-9c910e4187919cbb2d0dccdb8e720de869dabd2f.tar.bz2 | |
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
Diffstat (limited to 'remoting/protocol/protocol_test_client.cc')
| -rw-r--r-- | remoting/protocol/protocol_test_client.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/remoting/protocol/protocol_test_client.cc b/remoting/protocol/protocol_test_client.cc index 39abd70..e19aa5f42 100644 --- a/remoting/protocol/protocol_test_client.cc +++ b/remoting/protocol/protocol_test_client.cc @@ -14,6 +14,7 @@ extern "C" { #include <list> #include "base/at_exit.h" +#include "base/bind.h" #include "base/command_line.h" #include "base/test/mock_chrome_application_mac.h" #include "base/time.h" @@ -268,7 +269,10 @@ void ProtocolTestClient::Run(const std::string& username, closed_event_.Wait(); } - client_->Close(); + base::WaitableEvent closed_event(true, false); + client_->Close(base::Bind(&base::WaitableEvent::Signal, + base::Unretained(&closed_event))); + closed_event.Wait(); jingle_thread.Stop(); } |