Implement ModuleSnapshotWin::UUID

minidump/minidump_module_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 82 matching lines @@
                           const char* expected_pdb_name,
                           const UUID* expected_pdb_uuid,
                           time_t expected_pdb_timestamp,
                           uint32_t expected_pdb_age) {
   if (expected_pdb_name) {
     EXPECT_NE(0u, codeview_record->Rva);
 
     std::string observed_pdb_name;
     if (expected_pdb_uuid) {
       // The CodeView record should be a PDB 7.0 link.
-      const MinidumpModuleCodeViewRecordPDB70* codeview_pdb70_record =
-          MinidumpWritableAtLocationDescriptor<
-              MinidumpModuleCodeViewRecordPDB70>(file_contents,
-                                                 *codeview_record);
+      const CodeViewRecordPDB70* codeview_pdb70_record =
+          MinidumpWritableAtLocationDescriptor<CodeViewRecordPDB70>(
+              file_contents, *codeview_record);
       ASSERT_TRUE(codeview_pdb70_record);
       EXPECT_EQ(0,
                 memcmp(expected_pdb_uuid,
                        &codeview_pdb70_record->uuid,
                        sizeof(codeview_pdb70_record->uuid)));
       EXPECT_EQ(expected_pdb_age, codeview_pdb70_record->age);
 
       observed_pdb_name.assign(
           reinterpret_cast<const char*>(&codeview_pdb70_record->pdb_name[0]),
-          codeview_record->DataSize -
-              offsetof(MinidumpModuleCodeViewRecordPDB70, pdb_name));
+          codeview_record->DataSize - offsetof(CodeViewRecordPDB70, pdb_name));
     } else {
       // The CodeView record should be a PDB 2.0 link.
-      const MinidumpModuleCodeViewRecordPDB20* codeview_pdb20_record =
-          MinidumpWritableAtLocationDescriptor<
-              MinidumpModuleCodeViewRecordPDB20>(file_contents,
-                                                 *codeview_record);
+      const CodeViewRecordPDB20* codeview_pdb20_record =
+          MinidumpWritableAtLocationDescriptor<CodeViewRecordPDB20>(
+              file_contents, *codeview_record);
       ASSERT_TRUE(codeview_pdb20_record);
       EXPECT_EQ(static_cast<uint32_t>(expected_pdb_timestamp),
                 codeview_pdb20_record->timestamp);
       EXPECT_EQ(expected_pdb_age, codeview_pdb20_record->age);
 
       observed_pdb_name.assign(
           reinterpret_cast<const char*>(&codeview_pdb20_record->pdb_name[0]),
-          codeview_record->DataSize -
-              offsetof(MinidumpModuleCodeViewRecordPDB20, pdb_name));
+          codeview_record->DataSize - offsetof(CodeViewRecordPDB20, pdb_name));
     }
 
     // Check for, and then remove, the NUL terminator.
     EXPECT_EQ('\0', observed_pdb_name[observed_pdb_name.size() - 1]);
     observed_pdb_name.resize(observed_pdb_name.size() - 1);
 
     EXPECT_EQ(expected_pdb_name, observed_pdb_name);
   } else {
     // There should be no CodeView record.
     EXPECT_EQ(0u, codeview_record->DataSize);
@@ skipping 611 matching lines @@
   minidump_file_writer.AddStream(module_list_writer.Pass());
 
   StringFile string_file;
   ASSERT_DEATH_CHECK(minidump_file_writer.WriteEverything(&string_file),
                      "name_");
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad