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

Unified Diff: remoting/protocol/message_reader_unittest.cc

Issue 6266020: Fixed memory leaks in remoting_unittests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 9 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 | « no previous file | tools/valgrind/memcheck/suppressions.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/message_reader_unittest.cc
diff --git a/remoting/protocol/message_reader_unittest.cc b/remoting/protocol/message_reader_unittest.cc
index 5f17a1aee435c52c060d47fe9bb63894464d76b4..3237cb5fa93ba304aaa9d665b61ca8bf4756d273 100644
--- a/remoting/protocol/message_reader_unittest.cc
+++ b/remoting/protocol/message_reader_unittest.cc
@@ -59,6 +59,11 @@ class MessageReaderTest : public testing::Test {
return result == expected;
}
+ void RunAndDeleteTask(Task* task) {
+ task->Run();
+ delete task;
+ }
+
// MessageLoop must be first here, so that is is destroyed the last.
MessageLoop message_loop_;
@@ -90,7 +95,7 @@ TEST_F(MessageReaderTest, OneMessage_Delay) {
// finished processing the previous message.
EXPECT_FALSE(socket_.read_pending());
- done_task->Run();
+ RunAndDeleteTask(done_task);
EXPECT_TRUE(socket_.read_pending());
}
@@ -137,11 +142,11 @@ TEST_F(MessageReaderTest, TwoMessages_Together) {
// finished processing the previous message.
EXPECT_FALSE(socket_.read_pending());
- done_task1->Run();
+ RunAndDeleteTask(done_task1);
EXPECT_FALSE(socket_.read_pending());
- done_task2->Run();
+ RunAndDeleteTask(done_task2);
EXPECT_TRUE(socket_.read_pending());
}
@@ -172,7 +177,7 @@ TEST_F(MessageReaderTest, TwoMessages_Instant) {
// finished processing the second message.
EXPECT_FALSE(socket_.read_pending());
- done_task2->Run();
+ RunAndDeleteTask(done_task2);
EXPECT_TRUE(socket_.read_pending());
}
@@ -216,7 +221,7 @@ TEST_F(MessageReaderTest, TwoMessages_Separately) {
// finished processing the previous message.
EXPECT_FALSE(socket_.read_pending());
- done_task->Run();
+ RunAndDeleteTask(done_task);
EXPECT_TRUE(socket_.read_pending());
@@ -233,7 +238,7 @@ TEST_F(MessageReaderTest, TwoMessages_Separately) {
// finished processing the previous message.
EXPECT_FALSE(socket_.read_pending());
- done_task->Run();
+ RunAndDeleteTask(done_task);
EXPECT_TRUE(socket_.read_pending());
}
« no previous file with comments | « no previous file | tools/valgrind/memcheck/suppressions.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698