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

Unified Diff: net/socket/tcp_client_socket_unittest.cc

Issue 551135: Cleanup the unittest helpers in load_log_unittest.h.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Sync and merge conflicts Created 10 years, 11 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
« no previous file with comments | « net/socket/ssl_client_socket_unittest.cc ('k') | net/socket_stream/socket_stream_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/tcp_client_socket_unittest.cc
===================================================================
--- net/socket/tcp_client_socket_unittest.cc (revision 37380)
+++ net/socket/tcp_client_socket_unittest.cc (working copy)
@@ -101,20 +101,20 @@
scoped_refptr<LoadLog> log(new LoadLog(LoadLog::kUnbounded));
int rv = sock_->Connect(&callback, log);
- EXPECT_TRUE(net::LogContains(
- *log, 0, net::LoadLog::TYPE_TCP_CONNECT, net::LoadLog::PHASE_BEGIN));
+ EXPECT_TRUE(net::LogContainsBeginEvent(
+ *log, 0, net::LoadLog::TYPE_TCP_CONNECT));
if (rv != OK) {
ASSERT_EQ(rv, ERR_IO_PENDING);
- EXPECT_FALSE(net::LogContains(
- *log, -1, net::LoadLog::TYPE_TCP_CONNECT, net::LoadLog::PHASE_END));
+ EXPECT_FALSE(net::LogContainsEndEvent(
+ *log, -1, net::LoadLog::TYPE_TCP_CONNECT));
rv = callback.WaitForResult();
EXPECT_EQ(rv, OK);
}
EXPECT_TRUE(sock_->IsConnected());
- EXPECT_TRUE(net::LogContains(
- *log, -1, net::LoadLog::TYPE_TCP_CONNECT, net::LoadLog::PHASE_END));
+ EXPECT_TRUE(net::LogContainsEndEvent(
+ *log, -1, net::LoadLog::TYPE_TCP_CONNECT));
sock_->Disconnect();
EXPECT_FALSE(sock_->IsConnected());
« no previous file with comments | « net/socket/ssl_client_socket_unittest.cc ('k') | net/socket_stream/socket_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698