minidump: Reorganize MinidumpModuleCrashpadInfo to improve linking between structures

minidump/test/minidump_writable_test_util.h

Index: minidump/test/minidump_writable_test_util.h
diff --git a/minidump/test/minidump_writable_test_util.h b/minidump/test/minidump_writable_test_util.h
index 7165941b8633eae03c843a86b72ebffc66dec80f..ac7ac03860964a16a98d2033cc24266ea6649ef7 100644
--- a/minidump/test/minidump_writable_test_util.h
+++ b/minidump/test/minidump_writable_test_util.h
@@ -90,7 +90,7 @@ MINIDUMP_ALLOW_OVERSIZED_DATA(MINIDUMP_DIRECTORY);
 MINIDUMP_ALLOW_OVERSIZED_DATA(MINIDUMP_MEMORY_LIST);
 MINIDUMP_ALLOW_OVERSIZED_DATA(MINIDUMP_MODULE_LIST);
 MINIDUMP_ALLOW_OVERSIZED_DATA(MINIDUMP_THREAD_LIST);
-MINIDUMP_ALLOW_OVERSIZED_DATA(MinidumpLocationDescriptorList);
+MINIDUMP_ALLOW_OVERSIZED_DATA(MinidumpModuleCrashpadInfoList);
 MINIDUMP_ALLOW_OVERSIZED_DATA(MinidumpRVAList);
 MINIDUMP_ALLOW_OVERSIZED_DATA(MinidumpSimpleStringDictionary);
 
@@ -190,12 +190,6 @@ const MINIDUMP_THREAD_LIST* MinidumpWritableAtLocationDescriptor<
                           const MINIDUMP_LOCATION_DESCRIPTOR& location);
 
 template <>
-const MinidumpLocationDescriptorList*
-MinidumpWritableAtLocationDescriptor<MinidumpLocationDescriptorList>(
-    const std::string& file_contents,
-    const MINIDUMP_LOCATION_DESCRIPTOR& location);
-
-template <>
 const MinidumpModuleCodeViewRecordPDB20*
 MinidumpWritableAtLocationDescriptor<MinidumpModuleCodeViewRecordPDB20>(
     const std::string& file_contents,
@@ -208,6 +202,12 @@ MinidumpWritableAtLocationDescriptor<MinidumpModuleCodeViewRecordPDB70>(
     const MINIDUMP_LOCATION_DESCRIPTOR& location);
 
 template <>
+const MinidumpModuleCrashpadInfoList*
+MinidumpWritableAtLocationDescriptor<MinidumpModuleCrashpadInfoList>(
+    const std::string& file_contents,
+    const MINIDUMP_LOCATION_DESCRIPTOR& location);
+
+template <>
 const MinidumpSimpleStringDictionary*
 MinidumpWritableAtLocationDescriptor<MinidumpSimpleStringDictionary>(
     const std::string& file_contents,