Index: remoting/host/client_session_unittest.cc |
diff --git a/remoting/host/client_session_unittest.cc b/remoting/host/client_session_unittest.cc |
index 548b49f67225cfca50e4e5ec1710c9208dc06a97..c7dfa8987d4f74e7b37c4a6c277150823b7b6dee 100644 |
--- a/remoting/host/client_session_unittest.cc |
+++ b/remoting/host/client_session_unittest.cc |
@@ -25,7 +25,7 @@ class ClientSessionTest : public testing::Test { |
public: |
ClientSessionTest() {} |
- virtual void SetUp() { |
+ virtual void SetUp() OVERRIDE { |
client_jid_ = "user@domain/rest-of-jid"; |
// Set up a large default screen size that won't affect most tests. |
@@ -44,6 +44,13 @@ class ClientSessionTest : public testing::Test { |
&input_stub_, &capturer_); |
} |
+ virtual void TearDown() OVERRIDE { |
+ client_session_ = NULL; |
+ // Run message loop before destroying because protocol::Session is |
+ // destroyed asynchronously. |
+ message_loop_.RunAllPending(); |
+ } |
+ |
protected: |
SkISize default_screen_size_; |
MessageLoop message_loop_; |