Refactor minidump test utilities for MinidumpWritable, …

minidump/minidump_simple_string_dictionary_writer_test.cc

Index: minidump/minidump_simple_string_dictionary_writer_test.cc
diff --git a/minidump/minidump_simple_string_dictionary_writer_test.cc b/minidump/minidump_simple_string_dictionary_writer_test.cc
index c72c04c5987128129e2bbb470578b9a5284177be..bbe247652978a1b70521da9664fcda2d0c0bba0d 100644
--- a/minidump/minidump_simple_string_dictionary_writer_test.cc
+++ b/minidump/minidump_simple_string_dictionary_writer_test.cc
@@ -64,9 +64,11 @@ TEST(MinidumpSimpleStringDictionaryWriter, EmptyKeyValue) {
   EXPECT_EQ(12u, dictionary->entries[0].key);
   EXPECT_EQ(20u, dictionary->entries[0].value);
   EXPECT_EQ("",
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[0].key));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[0].key));
   EXPECT_EQ("",
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[0].value));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[0].value));
 }
 
 TEST(MinidumpSimpleStringDictionaryWriter, OneKeyValue) {
@@ -92,9 +94,11 @@ TEST(MinidumpSimpleStringDictionaryWriter, OneKeyValue) {
   EXPECT_EQ(12u, dictionary->entries[0].key);
   EXPECT_EQ(20u, dictionary->entries[0].value);
   EXPECT_EQ(kKey,
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[0].key));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[0].key));
   EXPECT_EQ(kValue,
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[0].value));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[0].value));
 }
 
 TEST(MinidumpSimpleStringDictionaryWriter, ThreeKeysValues) {
@@ -143,17 +147,23 @@ TEST(MinidumpSimpleStringDictionaryWriter, ThreeKeysValues) {
   // just the easiest way to write this test while the writer will output things
   // in a known order.
   EXPECT_EQ(kKey2,
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[0].key));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[0].key));
   EXPECT_EQ(kValue2,
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[0].value));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[0].value));
   EXPECT_EQ(kKey0,
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[1].key));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[1].key));
   EXPECT_EQ(kValue0,
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[1].value));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[1].value));
   EXPECT_EQ(kKey1,
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[2].key));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[2].key));
   EXPECT_EQ(kValue1,
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[2].value));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[2].value));
 }
 
 TEST(MinidumpSimpleStringDictionaryWriter, DuplicateKeyValue) {
@@ -183,9 +193,11 @@ TEST(MinidumpSimpleStringDictionaryWriter, DuplicateKeyValue) {
   EXPECT_EQ(12u, dictionary->entries[0].key);
   EXPECT_EQ(20u, dictionary->entries[0].value);
   EXPECT_EQ(kKey,
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[0].key));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[0].key));
   EXPECT_EQ(kValue1,
-            MinidumpUTF8StringAtRVA(file_writer, dictionary->entries[0].value));
+            MinidumpUTF8StringAtRVAAsString(file_writer.string(),
+                                            dictionary->entries[0].value));
 }
 
 }  // namespace