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

Unified Diff: snapshot/mac/process_reader_test.cc

Issue 853853002: win: Stub reorganization of MultiprocessExec (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: . Created 5 years, 11 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 | « snapshot/mac/mach_o_image_annotations_reader_test.cc ('k') | util/mach/exception_ports_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: snapshot/mac/process_reader_test.cc
diff --git a/snapshot/mac/process_reader_test.cc b/snapshot/mac/process_reader_test.cc
index 51034882946dcd17cd4d4cd067b381da2cf13db4..bae66ba63914505df69478169c277ca516ab6b65 100644
--- a/snapshot/mac/process_reader_test.cc
+++ b/snapshot/mac/process_reader_test.cc
@@ -88,7 +88,7 @@ class ProcessReaderChild final : public MachMultiprocess {
EXPECT_EQ(getpid(), process_reader.ParentProcessID());
EXPECT_EQ(ChildPID(), process_reader.ProcessID());
- int read_fd = ReadPipeFD();
+ int read_fd = ReadPipeHandle();
mach_vm_address_t address;
CheckedReadFile(read_fd, &address, sizeof(address));
@@ -99,7 +99,7 @@ class ProcessReaderChild final : public MachMultiprocess {
}
void MachMultiprocessChild() override {
- int write_fd = WritePipeFD();
+ int write_fd = WritePipeHandle();
mach_vm_address_t address =
reinterpret_cast<mach_vm_address_t>(kTestMemory);
@@ -107,7 +107,7 @@ class ProcessReaderChild final : public MachMultiprocess {
// Wait for the parent to signal that it’s OK to exit by closing its end of
// the pipe.
- CheckedReadFileAtEOF(ReadPipeFD());
+ CheckedReadFileAtEOF(ReadPipeHandle());
}
DISALLOW_COPY_AND_ASSIGN(ProcessReaderChild);
@@ -424,7 +424,7 @@ class ProcessReaderThreadedChild final : public MachMultiprocess {
ProcessReader process_reader;
ASSERT_TRUE(process_reader.Initialize(ChildTask()));
- int read_fd = ReadPipeFD();
+ int read_fd = ReadPipeHandle();
// Build a map of all expected threads, keyed by each thread’s ID, and with
// addresses that should lie somewhere within each thread’s stack as values.
@@ -461,7 +461,7 @@ class ProcessReaderThreadedChild final : public MachMultiprocess {
TestThreadPool thread_pool;
ASSERT_NO_FATAL_FAILURE(thread_pool.StartThreads(thread_count_));
- int write_fd = WritePipeFD();
+ int write_fd = WritePipeHandle();
// This thread isn’t part of the thread pool, but the parent will be able
// to inspect it. Write an entry for it.
@@ -498,7 +498,7 @@ class ProcessReaderThreadedChild final : public MachMultiprocess {
// Wait for the parent to signal that it’s OK to exit by closing its end of
// the pipe.
- CheckedReadFileAtEOF(ReadPipeFD());
+ CheckedReadFileAtEOF(ReadPipeHandle());
}
size_t thread_count_;
@@ -594,7 +594,7 @@ class ProcessReaderModulesChild final : public MachMultiprocess {
// and for dyld.
ASSERT_GE(modules.size(), 3u);
- int read_fd = ReadPipeFD();
+ int read_fd = ReadPipeHandle();
uint32_t expect_modules;
CheckedReadFile(read_fd, &expect_modules, sizeof(expect_modules));
@@ -635,7 +635,7 @@ class ProcessReaderModulesChild final : public MachMultiprocess {
}
void MachMultiprocessChild() override {
- int write_fd = WritePipeFD();
+ int write_fd = WritePipeHandle();
uint32_t dyld_image_count = _dyld_image_count();
const struct dyld_all_image_infos* dyld_image_infos =
@@ -677,7 +677,7 @@ class ProcessReaderModulesChild final : public MachMultiprocess {
// Wait for the parent to signal that it’s OK to exit by closing its end of
// the pipe.
- CheckedReadFileAtEOF(ReadPipeFD());
+ CheckedReadFileAtEOF(ReadPipeHandle());
}
DISALLOW_COPY_AND_ASSIGN(ProcessReaderModulesChild);
« no previous file with comments | « snapshot/mac/mach_o_image_annotations_reader_test.cc ('k') | util/mach/exception_ports_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698