summaryrefslogtreecommitdiffstats
path: root/net/socket/socket_test_util.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-24 09:50:31 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-24 09:50:31 +0000
commit94a9d1a995180fecbcc77f834cf4440eee8ca2ea (patch)
tree842bb1b18dd476bdd1bbcf584d5be2abf5470f9c /net/socket/socket_test_util.cc
parentd0cb7968035116a86d4f999890e6a153f3864f09 (diff)
downloadchromium_src-94a9d1a995180fecbcc77f834cf4440eee8ca2ea.zip
chromium_src-94a9d1a995180fecbcc77f834cf4440eee8ca2ea.tar.gz
chromium_src-94a9d1a995180fecbcc77f834cf4440eee8ca2ea.tar.bz2
Changes to build ash_unittests with RunLoop().RunUntilIdle().
BUG=131220 TEST=ash_unittests TBR=darin@chromium.org Review URL: https://chromiumcodereview.appspot.com/12983012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/socket_test_util.cc')
-rw-r--r--net/socket/socket_test_util.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index 81dbbea..adcff26b 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -12,6 +12,7 @@
#include "base/bind_helpers.h"
#include "base/compiler_specific.h"
#include "base/message_loop.h"
+#include "base/run_loop.h"
#include "base/time.h"
#include "net/base/address_family.h"
#include "net/base/address_list.h"
@@ -471,7 +472,7 @@ void DeterministicSocketData::Run() {
// since they can change in either.
while ((!at_write_eof() || !at_read_eof()) && !stopped()) {
if (counter % 2 == 0)
- MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
if (counter % 2 == 1) {
InvokeCallbacks();
}
@@ -482,7 +483,7 @@ void DeterministicSocketData::Run() {
while (socket_ && (socket_->write_pending() || socket_->read_pending()) &&
!stopped()) {
InvokeCallbacks();
- MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
SetStopped(false);
is_running_ = false;
@@ -1496,7 +1497,7 @@ bool ClientSocketPoolTest::ReleaseOneConnection(KeepAlive keep_alive) {
if (keep_alive == NO_KEEP_ALIVE)
(*i)->handle()->socket()->Disconnect();
(*i)->handle()->Reset();
- MessageLoop::current()->RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
return true;
}
}