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

Unified Diff: util/mach/exception_ports_test.cc

Issue 811823003: Cross platform low level file IO wrappers (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: . Created 6 years 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
Index: util/mach/exception_ports_test.cc
diff --git a/util/mach/exception_ports_test.cc b/util/mach/exception_ports_test.cc
index 538c203338d275f5e50d39ef2797d2aca9f2c088..abba9bfe9e50b1710e1ae929c5c1561e5d7d256a 100644
--- a/util/mach/exception_ports_test.cc
+++ b/util/mach/exception_ports_test.cc
@@ -25,7 +25,7 @@
#include "base/mac/scoped_mach_port.h"
#include "base/strings/stringprintf.h"
#include "gtest/gtest.h"
-#include "util/file/fd_io.h"
+#include "util/file/file_io.h"
#include "util/mach/exc_server_variants.h"
#include "util/mach/mach_extensions.h"
#include "util/mach/mach_message.h"
@@ -242,10 +242,10 @@ class TestExceptionPorts : public MachMultiprocess,
// Tell the parent process that everything is set up.
char c = '\0';
- CheckedWriteFD(test_exception_ports_->WritePipeFD(), &c, 1);
+ CheckedWriteFile(test_exception_ports_->WritePipeFD(), &c, 1);
// Wait for the parent process to say that its end is set up.
- CheckedReadFD(test_exception_ports_->ReadPipeFD(), &c, 1);
+ CheckedReadFile(test_exception_ports_->ReadPipeFD(), &c, 1);
EXPECT_EQ('\0', c);
// Regardless of where ExceptionPorts::SetExceptionPort() ran,
@@ -359,7 +359,7 @@ class TestExceptionPorts : public MachMultiprocess,
// Wait for the child process to be ready. It needs to have all of its
// threads set up before proceeding if in kSetOutOfProcess mode.
char c;
- CheckedReadFD(ReadPipeFD(), &c, 1);
+ CheckedReadFile(ReadPipeFD(), &c, 1);
EXPECT_EQ('\0', c);
mach_port_t local_port = LocalPort();
@@ -442,7 +442,7 @@ class TestExceptionPorts : public MachMultiprocess,
// Let the child process know that everything in the parent process is set
// up.
c = '\0';
- CheckedWriteFD(WritePipeFD(), &c, 1);
+ CheckedWriteFile(WritePipeFD(), &c, 1);
if (who_crashes_ != kNobodyCrashes) {
UniversalMachExcServer universal_mach_exc_server(this);
@@ -463,7 +463,7 @@ class TestExceptionPorts : public MachMultiprocess,
// Wait for the child process to exit or terminate, as indicated by it
// closing its pipe. This keeps LocalPort() alive in the child as
// RemotePort(), for the child’s use in its TestGetExceptionPorts().
- CheckedReadFDAtEOF(ReadPipeFD());
+ CheckedReadFileAtEOF(ReadPipeFD());
}
void MachMultiprocessChild() override {

Powered by Google App Engine
This is Rietveld 408576698