minidump: Migrate the rest of the tests to MinidumpWritableAtLocationDescriptor<>()

minidump/minidump_memory_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,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include "minidump/minidump_memory_writer.h"
 
 #include <dbghelp.h>
 #include <stdint.h>
 
 #include "base/basictypes.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_extensions.h"
 #include "minidump/minidump_file_writer.h"
 #include "minidump/minidump_stream_writer.h"
 #include "minidump/test/minidump_file_writer_test_util.h"
 #include "minidump/test/minidump_memory_writer_test_util.h"
+#include "minidump/test/minidump_writable_test_util.h"
 #include "util/file/string_file_writer.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
 const MinidumpStreamType kBogusStreamType =
     static_cast<MinidumpStreamType>(1234);
 
 // expected_streams is the expected number of streams in the file. The memory
@@ skipping 19 matching lines @@
   size_t directory_index = 0;
   if (expected_streams > 1) {
     ASSERT_EQ(kBogusStreamType, directory[directory_index].StreamType);
     ASSERT_EQ(0u, directory[directory_index].Location.DataSize);
     ASSERT_EQ(kMemoryListStreamOffset, directory[directory_index].Location.Rva);
     ++directory_index;
   }
 
   ASSERT_EQ(kMinidumpStreamTypeMemoryList,
             directory[directory_index].StreamType);
-  ASSERT_GE(directory[directory_index].Location.DataSize,
-            sizeof(MINIDUMP_MEMORY_LIST));
-  ASSERT_EQ(kMemoryListStreamOffset, directory[directory_index].Location.Rva);
+  EXPECT_EQ(kMemoryListStreamOffset, directory[directory_index].Location.Rva);
 
-  *memory_list = reinterpret_cast<const MINIDUMP_MEMORY_LIST*>(
-      &file_contents[kMemoryListStreamOffset]);
-
-  ASSERT_EQ(sizeof(MINIDUMP_MEMORY_LIST) +
-                (*memory_list)->NumberOfMemoryRanges *
-                    sizeof(MINIDUMP_MEMORY_DESCRIPTOR),
-            directory[directory_index].Location.DataSize);
+  *memory_list = MinidumpWritableAtLocationDescriptor<MINIDUMP_MEMORY_LIST>(
+      file_contents, directory[directory_index].Location);
+  ASSERT_TRUE(memory_list);
 }
 
 TEST(MinidumpMemoryWriter, EmptyMemoryList) {
   MinidumpFileWriter minidump_file_writer;
   MinidumpMemoryListWriter memory_list_writer;
 
   minidump_file_writer.AddStream(&memory_list_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
@@ skipping 204 matching lines @@
                                               &memory_list->MemoryRanges[1],
                                               file_writer.string(),
                                               kValue1,
                                               true);
   }
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad