Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4760)

Unified Diff: chrome/test/chromedriver/net/websocket_unittest.cc

Issue 1167163002: chrome: Remove use of MessageLoopProxy and deprecated MessageLoop APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added some missing message_loop.h includes. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/chromedriver/net/websocket_unittest.cc
diff --git a/chrome/test/chromedriver/net/websocket_unittest.cc b/chrome/test/chromedriver/net/websocket_unittest.cc
index 835b2406e7bb8c557fd22b4262c0b619e92c826e..2922c7fb25b731d9e143cba54fbdd88b4231e407 100644
--- a/chrome/test/chromedriver/net/websocket_unittest.cc
+++ b/chrome/test/chromedriver/net/websocket_unittest.cc
@@ -11,7 +11,6 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
-#include "base/message_loop/message_loop_proxy.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread.h"
@@ -31,7 +30,7 @@ void OnConnectFinished(base::RunLoop* run_loop, int* save_error, int error) {
void RunPending(base::MessageLoop* loop) {
base::RunLoop run_loop;
- loop->PostTask(FROM_HERE, run_loop.QuitClosure());
+ loop->task_runner()->PostTask(FROM_HERE, run_loop.QuitClosure());
run_loop.Run();
}
@@ -92,9 +91,8 @@ class WebSocketTest : public testing::Test {
scoped_ptr<WebSocket> sock(new WebSocket(url, listener));
base::RunLoop run_loop;
sock->Connect(base::Bind(&OnConnectFinished, &run_loop, &error));
- loop_.PostDelayedTask(
- FROM_HERE, run_loop.QuitClosure(),
- base::TimeDelta::FromSeconds(10));
+ loop_.task_runner()->PostDelayedTask(FROM_HERE, run_loop.QuitClosure(),
+ base::TimeDelta::FromSeconds(10));
run_loop.Run();
if (error == net::OK)
return sock.Pass();
@@ -113,9 +111,8 @@ class WebSocketTest : public testing::Test {
ASSERT_TRUE(sock->Send(messages[i]));
}
base::RunLoop run_loop;
- loop_.PostDelayedTask(
- FROM_HERE, run_loop.QuitClosure(),
- base::TimeDelta::FromSeconds(10));
+ loop_.task_runner()->PostDelayedTask(FROM_HERE, run_loop.QuitClosure(),
+ base::TimeDelta::FromSeconds(10));
run_loop.Run();
}
@@ -163,9 +160,8 @@ TEST_F(WebSocketTest, CloseOnReceive) {
scoped_ptr<WebSocket> sock(CreateConnectedWebSocket(&listener));
ASSERT_TRUE(sock);
ASSERT_TRUE(sock->Send("hi"));
- loop_.PostDelayedTask(
- FROM_HERE, run_loop.QuitClosure(),
- base::TimeDelta::FromSeconds(10));
+ loop_.task_runner()->PostDelayedTask(FROM_HERE, run_loop.QuitClosure(),
+ base::TimeDelta::FromSeconds(10));
run_loop.Run();
}
@@ -177,9 +173,8 @@ TEST_F(WebSocketTest, CloseOnSend) {
server_.Stop();
sock->Send("hi");
- loop_.PostDelayedTask(
- FROM_HERE, run_loop.QuitClosure(),
- base::TimeDelta::FromSeconds(10));
+ loop_.task_runner()->PostDelayedTask(FROM_HERE, run_loop.QuitClosure(),
+ base::TimeDelta::FromSeconds(10));
run_loop.Run();
ASSERT_FALSE(sock->Send("hi"));
}
« no previous file with comments | « chrome/test/chromedriver/net/test_http_server.cc ('k') | chrome/test/chromedriver/server/chromedriver_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698