minidump: Reorganize MinidumpModuleCrashpadInfo to improve linking between structures

minidump/minidump_crashpad_info_writer_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 122 matching lines @@
 
 TEST(MinidumpCrashpadInfoWriter, CrashpadModuleList) {
   const uint32_t kMinidumpModuleListIndex = 3;
 
   MinidumpFileWriter minidump_file_writer;
   auto crashpad_info_writer = make_scoped_ptr(new MinidumpCrashpadInfoWriter());
 
   auto module_list_writer =
       make_scoped_ptr(new MinidumpModuleCrashpadInfoListWriter());
   auto module_writer = make_scoped_ptr(new MinidumpModuleCrashpadInfoWriter());
-  module_writer->SetMinidumpModuleListIndex(kMinidumpModuleListIndex);
-  module_list_writer->AddModule(module_writer.Pass());
+  module_list_writer->AddModule(module_writer.Pass(), kMinidumpModuleListIndex);
   crashpad_info_writer->SetModuleList(module_list_writer.Pass());
 
   EXPECT_TRUE(crashpad_info_writer->IsUseful());
 
   minidump_file_writer.AddStream(crashpad_info_writer.Pass());
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MinidumpCrashpadInfo* crashpad_info = nullptr;
   const MinidumpSimpleStringDictionary* simple_annotations = nullptr;
   const MinidumpModuleCrashpadInfoList* module_list = nullptr;
 
   ASSERT_NO_FATAL_FAILURE(GetCrashpadInfoStream(
       string_file.string(), &crashpad_info, &simple_annotations, &module_list));
 
   EXPECT_EQ(MinidumpCrashpadInfo::kVersion, crashpad_info->version);
   EXPECT_FALSE(simple_annotations);
 
   ASSERT_TRUE(module_list);
   ASSERT_EQ(1u, module_list->count);
 
+  EXPECT_EQ(kMinidumpModuleListIndex,
+            module_list->modules[0].minidump_module_list_index);
   const MinidumpModuleCrashpadInfo* module =
       MinidumpWritableAtLocationDescriptor<MinidumpModuleCrashpadInfo>(
-          string_file.string(), module_list->children[0]);
+          string_file.string(), module_list->modules[0].location);
   ASSERT_TRUE(module);
 
   EXPECT_EQ(MinidumpModuleCrashpadInfo::kVersion, module->version);
-  EXPECT_EQ(kMinidumpModuleListIndex, module->minidump_module_list_index);
   EXPECT_EQ(0u, module->list_annotations.DataSize);
   EXPECT_EQ(0u, module->list_annotations.Rva);
   EXPECT_EQ(0u, module->simple_annotations.DataSize);
   EXPECT_EQ(0u, module->simple_annotations.Rva);
 }
 
 TEST(MinidumpCrashpadInfoWriter, InitializeFromSnapshot) {
   const char kKey[] = "version";
   const char kValue[] = "40.0.2214.111";
   const char kEntry[] = "This is a simple annotation in a list.";
@@ skipping 44 matching lines @@
   EXPECT_EQ(kKey,
             MinidumpUTF8StringAtRVAAsString(
                 string_file.string(), simple_annotations->entries[0].key));
   EXPECT_EQ(kValue,
             MinidumpUTF8StringAtRVAAsString(
                 string_file.string(), simple_annotations->entries[0].value));
 
   ASSERT_TRUE(module_list);
   ASSERT_EQ(1u, module_list->count);
 
+  EXPECT_EQ(0u, module_list->modules[0].minidump_module_list_index);
   const MinidumpModuleCrashpadInfo* module =
       MinidumpWritableAtLocationDescriptor<MinidumpModuleCrashpadInfo>(
-          string_file.string(), module_list->children[0]);
+          string_file.string(), module_list->modules[0].location);
   ASSERT_TRUE(module);
 
   EXPECT_EQ(MinidumpModuleCrashpadInfo::kVersion, module->version);
-  EXPECT_EQ(0u, module->minidump_module_list_index);
 
   const MinidumpRVAList* list_annotations =
       MinidumpWritableAtLocationDescriptor<MinidumpRVAList>(
           string_file.string(), module->list_annotations);
   ASSERT_TRUE(list_annotations);
 
   ASSERT_EQ(1u, list_annotations->count);
   EXPECT_EQ(kEntry,
             MinidumpUTF8StringAtRVAAsString(string_file.string(),
                                             list_annotations->children[0]));
 
   const MinidumpSimpleStringDictionary* module_simple_annotations =
       MinidumpWritableAtLocationDescriptor<MinidumpSimpleStringDictionary>(
           string_file.string(), module->simple_annotations);
   EXPECT_FALSE(module_simple_annotations);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad