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

Unified Diff: ipc/ipc_test_base.cc

Issue 538593002: Fix a DCHECK violation in ipc_perftests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ipc_perf
Patch Set: Created 6 years, 3 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 | « ipc/ipc_test_base.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/ipc_test_base.cc
diff --git a/ipc/ipc_test_base.cc b/ipc/ipc_test_base.cc
index 974329d4a5548efbd0286cb596de8c222c5d7713..dca101466fb49abfbf56ef4b0225b61121e74568 100644
--- a/ipc/ipc_test_base.cc
+++ b/ipc/ipc_test_base.cc
@@ -29,24 +29,26 @@ IPCTestBase::IPCTestBase()
IPCTestBase::~IPCTestBase() {
}
-void IPCTestBase::SetUp() {
- MultiProcessTest::SetUp();
-
- // Construct a fresh Message loop for the duration of each test.
- DCHECK(!message_loop_.get());
- message_loop_.reset(new base::MessageLoopForIO());
-}
-
void IPCTestBase::TearDown() {
- DCHECK(message_loop_.get());
message_loop_.reset();
MultiProcessTest::TearDown();
}
void IPCTestBase::Init(const std::string& test_client_name) {
+ InitWithCustomMessageLoop(
+ test_client_name,
+ scoped_ptr<base::MessageLoop>(new base::MessageLoopForIO()));
+}
+
+void IPCTestBase::InitWithCustomMessageLoop(
+ const std::string& test_client_name,
+ scoped_ptr<base::MessageLoop> message_loop) {
DCHECK(!test_client_name.empty());
DCHECK(test_client_name_.empty());
+ DCHECK(!message_loop_);
+
test_client_name_ = test_client_name;
+ message_loop_ = message_loop.Pass();
}
void IPCTestBase::CreateChannel(IPC::Listener* listener) {
@@ -133,7 +135,3 @@ bool IPCTestBase::WaitForClientShutdown() {
scoped_refptr<base::TaskRunner> IPCTestBase::task_runner() {
return message_loop_->message_loop_proxy();
}
-
-void IPCTestBase::set_message_loop(scoped_ptr<base::MessageLoop> loop) {
- message_loop_ = loop.Pass();
-}
« no previous file with comments | « ipc/ipc_test_base.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698