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

Unified Diff: mojo/edk/system/channel_unittest.cc

Issue 1408133004: EDK: Remove tracked_objects::Location argument in TestIOThread methods (etc.). (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 2 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 | « mojo/edk/system/channel_test_base.cc ('k') | mojo/edk/system/data_pipe_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/channel_unittest.cc
diff --git a/mojo/edk/system/channel_unittest.cc b/mojo/edk/system/channel_unittest.cc
index ec668cbf5728b6b7b0a2d9d37c586d1b9660759e..b90c8847fa119726694423e2de615771208f0388 100644
--- a/mojo/edk/system/channel_unittest.cc
+++ b/mojo/edk/system/channel_unittest.cc
@@ -25,10 +25,8 @@ void DoNothing() {}
// ChannelTest.InitShutdown ----------------------------------------------------
TEST_F(ChannelTest, InitShutdown) {
- PostMethodToIOThreadAndWait(FROM_HERE,
- &ChannelTest::CreateAndInitChannelOnIOThread, 0);
- PostMethodToIOThreadAndWait(FROM_HERE,
- &ChannelTest::ShutdownChannelOnIOThread, 0);
+ PostMethodToIOThreadAndWait(&ChannelTest::CreateAndInitChannelOnIOThread, 0);
+ PostMethodToIOThreadAndWait(&ChannelTest::ShutdownChannelOnIOThread, 0);
// Okay to destroy |Channel| on not-the-I/O-thread.
channel(0)->AssertHasOneRef();
@@ -38,8 +36,7 @@ TEST_F(ChannelTest, InitShutdown) {
// ChannelTest.CloseBeforeAttachAndRun -----------------------------------------
TEST_F(ChannelTest, CloseBeforeRun) {
- PostMethodToIOThreadAndWait(FROM_HERE,
- &ChannelTest::CreateAndInitChannelOnIOThread, 0);
+ PostMethodToIOThreadAndWait(&ChannelTest::CreateAndInitChannelOnIOThread, 0);
RefPtr<ChannelEndpoint> channel_endpoint;
auto mp = MessagePipe::CreateLocalProxy(&channel_endpoint);
@@ -48,8 +45,7 @@ TEST_F(ChannelTest, CloseBeforeRun) {
channel(0)->SetBootstrapEndpoint(std::move(channel_endpoint));
- PostMethodToIOThreadAndWait(FROM_HERE,
- &ChannelTest::ShutdownChannelOnIOThread, 0);
+ PostMethodToIOThreadAndWait(&ChannelTest::ShutdownChannelOnIOThread, 0);
channel(0)->AssertHasOneRef();
}
@@ -57,8 +53,7 @@ TEST_F(ChannelTest, CloseBeforeRun) {
// ChannelTest.ShutdownAfterAttachAndRun ---------------------------------------
TEST_F(ChannelTest, ShutdownAfterAttach) {
- PostMethodToIOThreadAndWait(FROM_HERE,
- &ChannelTest::CreateAndInitChannelOnIOThread, 0);
+ PostMethodToIOThreadAndWait(&ChannelTest::CreateAndInitChannelOnIOThread, 0);
RefPtr<ChannelEndpoint> channel_endpoint;
auto mp = MessagePipe::CreateLocalProxy(&channel_endpoint);
@@ -72,8 +67,7 @@ TEST_F(ChannelTest, ShutdownAfterAttach) {
mp->AddAwakable(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123, nullptr));
// Don't wait for the shutdown to run ...
- PostMethodToIOThreadAndWait(FROM_HERE,
- &ChannelTest::ShutdownChannelOnIOThread, 0);
+ PostMethodToIOThreadAndWait(&ChannelTest::ShutdownChannelOnIOThread, 0);
// ... since this |Wait()| should fail once the channel is shut down.
EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,
@@ -91,16 +85,14 @@ TEST_F(ChannelTest, ShutdownAfterAttach) {
// ChannelTest.WaitAfterAttachRunAndShutdown -----------------------------------
TEST_F(ChannelTest, WaitAfterAttachRunAndShutdown) {
- PostMethodToIOThreadAndWait(FROM_HERE,
- &ChannelTest::CreateAndInitChannelOnIOThread, 0);
+ PostMethodToIOThreadAndWait(&ChannelTest::CreateAndInitChannelOnIOThread, 0);
RefPtr<ChannelEndpoint> channel_endpoint;
auto mp = MessagePipe::CreateLocalProxy(&channel_endpoint);
channel(0)->SetBootstrapEndpoint(std::move(channel_endpoint));
- PostMethodToIOThreadAndWait(FROM_HERE,
- &ChannelTest::ShutdownChannelOnIOThread, 0);
+ PostMethodToIOThreadAndWait(&ChannelTest::ShutdownChannelOnIOThread, 0);
Waiter waiter;
waiter.Init();
@@ -124,8 +116,8 @@ TEST_F(ChannelTest, EndpointChannelShutdownRace) {
for (size_t i = 0; i < kIterations; i++) {
// Need a new set of |RawChannel|s on every iteration.
SetUp();
- PostMethodToIOThreadAndWait(
- FROM_HERE, &ChannelTest::CreateAndInitChannelOnIOThread, 0);
+ PostMethodToIOThreadAndWait(&ChannelTest::CreateAndInitChannelOnIOThread,
+ 0);
RefPtr<ChannelEndpoint> channel_endpoint;
auto mp = MessagePipe::CreateLocalProxy(&channel_endpoint);
@@ -133,12 +125,12 @@ TEST_F(ChannelTest, EndpointChannelShutdownRace) {
channel(0)->SetBootstrapEndpoint(std::move(channel_endpoint));
io_thread()->PostTask(
- FROM_HERE, base::Bind(&ChannelTest::ShutdownAndReleaseChannelOnIOThread,
- base::Unretained(this), 0));
+ base::Bind(&ChannelTest::ShutdownAndReleaseChannelOnIOThread,
+ base::Unretained(this), 0));
mp->Close(0);
// Wait for the IO thread to finish shutting down the channel.
- io_thread()->PostTaskAndWait(FROM_HERE, base::Bind(&DoNothing));
+ io_thread()->PostTaskAndWait(base::Bind(&DoNothing));
EXPECT_FALSE(channel(0));
}
}
« no previous file with comments | « mojo/edk/system/channel_test_base.cc ('k') | mojo/edk/system/data_pipe_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698