summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/jingle_session_unittest.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-24 15:30:16 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-24 15:30:16 +0000
commiteda79edcb13a56625b66c891d66fe534253964c7 (patch)
treed5e337e1a0555ecae844a6bb34e155a07651a8d7 /remoting/protocol/jingle_session_unittest.cc
parent5b76d6a09dd000bbdd2c6f556c4dc598368f4a91 (diff)
downloadchromium_src-eda79edcb13a56625b66c891d66fe534253964c7.zip
chromium_src-eda79edcb13a56625b66c891d66fe534253964c7.tar.gz
chromium_src-eda79edcb13a56625b66c891d66fe534253964c7.tar.bz2
Migrate remoting/ to base::RunLoop::RunUntilIdle();
base::MessageLoop::RunUntilIdle() API is deprecated and the preferred way is using RunLoop now. BUG=333558 TEST=remoting_unittests R=sergeyu@chromium.org,wez@chromium.org Review URL: https://codereview.chromium.org/144753006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246897 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/jingle_session_unittest.cc')
-rw-r--r--remoting/protocol/jingle_session_unittest.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/remoting/protocol/jingle_session_unittest.cc b/remoting/protocol/jingle_session_unittest.cc
index 62e4d40..dcca077 100644
--- a/remoting/protocol/jingle_session_unittest.cc
+++ b/remoting/protocol/jingle_session_unittest.cc
@@ -6,6 +6,7 @@
#include "base/bind.h"
#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "base/test/test_timeouts.h"
#include "base/time/time.h"
#include "net/socket/socket.h"
@@ -121,7 +122,7 @@ class JingleSessionTest : public testing::Test {
virtual void TearDown() {
CloseSessions();
CloseSessionManager();
- message_loop_->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
void CloseSessions() {
@@ -239,7 +240,7 @@ class JingleSessionTest : public testing::Test {
CandidateSessionConfig::CreateDefault());
client_session_->SetEventHandler(&client_session_event_handler_);
- message_loop_->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
void CreateChannel() {
@@ -322,7 +323,7 @@ TEST_F(JingleSessionTest, RejectConnection) {
kHostJid, authenticator.Pass(), CandidateSessionConfig::CreateDefault());
client_session_->SetEventHandler(&client_session_event_handler_);
- message_loop_->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
// Verify that we can connect two endpoints with single-step authentication.