| Index: mojo/edk/system/ipc_support_unittest.cc
|
| diff --git a/mojo/edk/system/ipc_support_unittest.cc b/mojo/edk/system/ipc_support_unittest.cc
|
| index 838c4cef2ee8b074e651981c34c5ac96b6dc85f6..b0b10b16961c693cfc19c44bc84e2a4f67363d7f 100644
|
| --- a/mojo/edk/system/ipc_support_unittest.cc
|
| +++ b/mojo/edk/system/ipc_support_unittest.cc
|
| @@ -10,7 +10,6 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| -#include "base/location.h"
|
| #include "base/logging.h"
|
| #include "base/synchronization/waitable_event.h"
|
| #include "base/test/test_timeouts.h"
|
| @@ -196,7 +195,6 @@ class TestSlaveConnection {
|
| WaitForChannelToSlave();
|
|
|
| test_io_thread_->PostTaskAndWait(
|
| - FROM_HERE,
|
| base::Bind(&ChannelManager::ShutdownChannelOnIOThread,
|
| base::Unretained(master_ipc_support_->channel_manager()),
|
| slave_id_));
|
| @@ -263,7 +261,6 @@ class TestSlave {
|
| WaitForChannelToMaster();
|
|
|
| test_io_thread_->PostTaskAndWait(
|
| - FROM_HERE,
|
| base::Bind(&ChannelManager::ShutdownChannelOnIOThread,
|
| base::Unretained(slave_ipc_support_.channel_manager()),
|
| kMasterProcessIdentifier));
|
| @@ -272,8 +269,8 @@ class TestSlave {
|
| // No other methods may be called after this.
|
| void ShutdownIPCSupport() {
|
| test_io_thread_->PostTaskAndWait(
|
| - FROM_HERE, base::Bind(&IPCSupport::ShutdownOnIOThread,
|
| - base::Unretained(&slave_ipc_support_)));
|
| + base::Bind(&IPCSupport::ShutdownOnIOThread,
|
| + base::Unretained(&slave_ipc_support_)));
|
| }
|
|
|
| private:
|
| @@ -391,8 +388,8 @@ class IPCSupportTest : public testing::Test {
|
|
|
| void ShutdownMasterIPCSupport() {
|
| test_io_thread_.PostTaskAndWait(
|
| - FROM_HERE, base::Bind(&IPCSupport::ShutdownOnIOThread,
|
| - base::Unretained(&master_ipc_support_)));
|
| + base::Bind(&IPCSupport::ShutdownOnIOThread,
|
| + base::Unretained(&master_ipc_support_)));
|
| }
|
|
|
| embedder::SimplePlatformSupport& platform_support() {
|
| @@ -624,9 +621,8 @@ TEST_F(IPCSupportTest, MasterSlaveInternal) {
|
| EXPECT_EQ(1u, n);
|
| EXPECT_EQ('x', c);
|
|
|
| - test_io_thread().PostTaskAndWait(
|
| - FROM_HERE, base::Bind(&IPCSupport::ShutdownOnIOThread,
|
| - base::Unretained(&slave_ipc_support)));
|
| + test_io_thread().PostTaskAndWait(base::Bind(
|
| + &IPCSupport::ShutdownOnIOThread, base::Unretained(&slave_ipc_support)));
|
|
|
| EXPECT_TRUE(master_process_delegate().TryWaitForOnSlaveDisconnect());
|
|
|
| @@ -719,8 +715,7 @@ MOJO_MULTIPROCESS_TEST_CHILD_TEST(MultiprocessMasterSlaveInternal) {
|
| mojo::test::BlockingWrite(second_platform_handle.get(), "!", 1, &n));
|
| EXPECT_EQ(1u, n);
|
|
|
| - test_io_thread.PostTaskAndWait(FROM_HERE,
|
| - base::Bind(&IPCSupport::ShutdownOnIOThread,
|
| + test_io_thread.PostTaskAndWait(base::Bind(&IPCSupport::ShutdownOnIOThread,
|
| base::Unretained(&ipc_support)));
|
| }
|
|
|
|
|