Index: third_party/crashpad/crashpad/test/multiprocess_posix.cc |
diff --git a/third_party/crashpad/crashpad/test/multiprocess_posix.cc b/third_party/crashpad/crashpad/test/multiprocess_posix.cc |
index 4e0e6e6d2855f6c1325ddb01194b1a60f4b032c4..d6796dda8556f305435244743e83c1d5646775a9 100644 |
--- a/third_party/crashpad/crashpad/test/multiprocess_posix.cc |
+++ b/third_party/crashpad/crashpad/test/multiprocess_posix.cc |
@@ -60,7 +60,7 @@ Multiprocess::Multiprocess() |
} |
void Multiprocess::Run() { |
- ASSERT_EQ(nullptr, info_); |
+ ASSERT_EQ(info_, nullptr); |
std::unique_ptr<internal::MultiprocessInfo> info( |
new internal::MultiprocessInfo); |
base::AutoReset<internal::MultiprocessInfo*> reset_info(&info_, info.get()); |
@@ -90,7 +90,7 @@ void Multiprocess::Run() { |
int status; |
pid_t wait_pid = HANDLE_EINTR(waitpid(pid, &status, 0)); |
- ASSERT_EQ(pid, wait_pid) << ErrnoMessage("waitpid"); |
+ ASSERT_EQ(wait_pid, pid) << ErrnoMessage("waitpid"); |
TerminationReason reason; |
int code; |
@@ -139,21 +139,21 @@ Multiprocess::~Multiprocess() { |
void Multiprocess::PreFork() { |
int pipe_fds_c2p[2]; |
int rv = pipe(pipe_fds_c2p); |
- ASSERT_EQ(0, rv) << ErrnoMessage("pipe"); |
+ ASSERT_EQ(rv, 0) << ErrnoMessage("pipe"); |
info_->pipe_c2p_read.reset(pipe_fds_c2p[0]); |
info_->pipe_c2p_write.reset(pipe_fds_c2p[1]); |
int pipe_fds_p2c[2]; |
rv = pipe(pipe_fds_p2c); |
- ASSERT_EQ(0, rv) << ErrnoMessage("pipe"); |
+ ASSERT_EQ(rv, 0) << ErrnoMessage("pipe"); |
info_->pipe_p2c_read.reset(pipe_fds_p2c[0]); |
info_->pipe_p2c_write.reset(pipe_fds_p2c[1]); |
} |
pid_t Multiprocess::ChildPID() const { |
- EXPECT_NE(0, info_->child_pid); |
+ EXPECT_NE(info_->child_pid, 0); |
return info_->child_pid; |
} |