10.6 runtime compatibility for ProcessReader and MachOImageReader test

util/mac/process_reader_test.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 14 matching lines @@
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/mac/scoped_mach_port.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "util/file/fd_io.h"
+#include "util/mac/mach_o_image_reader.h"
 #include "util/mach/mach_extensions.h"
 #include "util/stdlib/pointer_container.h"
 #include "util/test/errors.h"
 #include "util/test/mac/dyld.h"
 #include "util/test/mac/mach_errors.h"
 #include "util/test/mac/mach_multiprocess.h"
 
 namespace {
 
 using namespace crashpad;
@@ skipping 501 matching lines @@
   ASSERT_EQ(dyld_image_count + 1, modules.size());
 
   for (uint32_t index = 0; index < dyld_image_count; ++index) {
     SCOPED_TRACE(base::StringPrintf(
         "index %u, name %s", index, modules[index].name.c_str()));
 
     const char* dyld_image_name = _dyld_get_image_name(index);
     EXPECT_EQ(dyld_image_name, modules[index].name);
     EXPECT_EQ(
         reinterpret_cast<mach_vm_address_t>(_dyld_get_image_header(index)),
-        modules[index].address);
+        modules[index].reader->Address());
 
     if (index == 0) {
       // dyld didn’t load the main executable, so it couldn’t record its
       // timestamp, and it is reported as 0.
       EXPECT_EQ(0, modules[index].timestamp);
     } else {
       // Hope that the module didn’t change on disk.
       struct stat stat_buf;
       int rv = stat(dyld_image_name, &stat_buf);
       EXPECT_EQ(0, rv) << ErrnoMessage("stat");
       if (rv == 0) {
         EXPECT_EQ(stat_buf.st_mtime, modules[index].timestamp);
       }
     }
   }
 
   size_t index = modules.size() - 1;
   EXPECT_EQ("/usr/lib/dyld", modules[index].name);
 
   // dyld didn’t load itself either, so it couldn’t record its timestamp, and it
   // is also reported as 0.
   EXPECT_EQ(0, modules[index].timestamp);
 
   const struct dyld_all_image_infos* dyld_image_infos =
       _dyld_get_all_image_infos();
   if (dyld_image_infos->version >= 2) {
-    EXPECT_EQ(reinterpret_cast<mach_vm_address_t>(
-        dyld_image_infos->dyldImageLoadAddress), modules[index].address);
+    EXPECT_EQ(
+        reinterpret_cast<mach_vm_address_t>(
+            dyld_image_infos->dyldImageLoadAddress),
+        modules[index].reader->Address());
   }
 }
 
 class ProcessReaderModulesChild final : public MachMultiprocess {
  public:
   ProcessReaderModulesChild() : MachMultiprocess() {}
 
   ~ProcessReaderModulesChild() {}
 
  private:
@@ skipping 23 matching lines @@
       CheckedReadFD(
           read_fd, &expect_name_length, sizeof(expect_name_length));
 
       // The NUL terminator is not read.
       std::string expect_name(expect_name_length, '\0');
       CheckedReadFD(read_fd, &expect_name[0], expect_name_length);
       EXPECT_EQ(expect_name, modules[index].name);
 
       mach_vm_address_t expect_address;
       CheckedReadFD(read_fd, &expect_address, sizeof(expect_address));
-      EXPECT_EQ(expect_address, modules[index].address);
+      EXPECT_EQ(expect_address, modules[index].reader->Address());
 
       if (index == 0 || index == modules.size() - 1) {
         // dyld didn’t load the main executable or itself, so it couldn’t record
         // these timestamps, and they are reported as 0.
         EXPECT_EQ(0, modules[index].timestamp);
       } else {
         // Hope that the module didn’t change on disk.
         struct stat stat_buf;
         int rv = stat(expect_name.c_str(), &stat_buf);
         EXPECT_EQ(0, rv) << ErrnoMessage("stat");
@@ skipping 51 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ProcessReaderModulesChild);
 };
 
 TEST(ProcessReader, ChildModules) {
   ProcessReaderModulesChild process_reader_modules_child;
   process_reader_modules_child.Run();
 }
 
 }  // namespace