minidump: Reorganize MinidumpModuleCrashpadInfo to improve linking between structures

minidump/test/minidump_writable_test_util.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 163 matching lines @@
 };
 
 struct MinidumpThreadListTraits {
   using ListType = MINIDUMP_THREAD_LIST;
   enum : size_t { kElementSize = sizeof(MINIDUMP_THREAD) };
   static size_t ElementCount(const ListType* list) {
     return list->NumberOfThreads;
   }
 };
 
-struct MinidumpLocationDescriptorListTraits {
-  using ListType = MinidumpLocationDescriptorList;
-  enum : size_t { kElementSize = sizeof(MINIDUMP_LOCATION_DESCRIPTOR) };
+struct MinidumpModuleCrashpadInfoListTraits {
+  using ListType = MinidumpModuleCrashpadInfoList;
+  enum : size_t { kElementSize = sizeof(MinidumpModuleCrashpadInfoLink) };
   static size_t ElementCount(const ListType* list) {
     return list->count;
   }
 };
 
 struct MinidumpSimpleStringDictionaryListTraits {
   using ListType = MinidumpSimpleStringDictionary;
   enum : size_t { kElementSize = sizeof(MinidumpSimpleStringDictionaryEntry) };
   static size_t ElementCount(const ListType* list) {
     return list->count;
@@ skipping 41 matching lines @@
 
 template <>
 const MINIDUMP_THREAD_LIST* MinidumpWritableAtLocationDescriptor<
     MINIDUMP_THREAD_LIST>(const std::string& file_contents,
                           const MINIDUMP_LOCATION_DESCRIPTOR& location) {
   return MinidumpListAtLocationDescriptor<MinidumpThreadListTraits>(
       file_contents, location);
 }
 
 template <>
-const MinidumpLocationDescriptorList*
-MinidumpWritableAtLocationDescriptor<MinidumpLocationDescriptorList>(
+const MinidumpModuleCrashpadInfoList*
+MinidumpWritableAtLocationDescriptor<MinidumpModuleCrashpadInfoList>(
     const std::string& file_contents,
     const MINIDUMP_LOCATION_DESCRIPTOR& location) {
-  return MinidumpListAtLocationDescriptor<MinidumpLocationDescriptorListTraits>(
+  return MinidumpListAtLocationDescriptor<MinidumpModuleCrashpadInfoListTraits>(
       file_contents, location);
 }
 
 template <>
 const MinidumpSimpleStringDictionary*
 MinidumpWritableAtLocationDescriptor<MinidumpSimpleStringDictionary>(
     const std::string& file_contents,
     const MINIDUMP_LOCATION_DESCRIPTOR& location) {
   return MinidumpListAtLocationDescriptor<
       MinidumpSimpleStringDictionaryListTraits>(file_contents, location);
@@ skipping 56 matching lines @@
 size_t TestUInt32MinidumpWritable::SizeOfObject() {
   return sizeof(value_);
 }
 
 bool TestUInt32MinidumpWritable::WriteObject(FileWriterInterface* file_writer) {
   return file_writer->Write(&value_, sizeof(value_));
 }
 
 }  // namespace test
 }  // namespace crashpad