minidump: Change the ownership model

minidump/minidump_simple_string_dictionary_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 39 matching lines @@
   const MinidumpSimpleStringDictionary* dictionary =
       MinidumpSimpleStringDictionaryAtStart(file_writer.string(), 0);
   ASSERT_TRUE(dictionary);
   EXPECT_EQ(0u, dictionary->count);
 }
 
 TEST(MinidumpSimpleStringDictionaryWriter, EmptyKeyValue) {
   StringFileWriter file_writer;
 
   MinidumpSimpleStringDictionaryWriter dictionary_writer;
-  MinidumpSimpleStringDictionaryEntryWriter entry_writer;
-  dictionary_writer.AddEntry(&entry_writer);
+  auto entry_writer =
+      make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter());
+  dictionary_writer.AddEntry(entry_writer.Pass());
 
   EXPECT_TRUE(dictionary_writer.WriteEverything(&file_writer));
   ASSERT_EQ(sizeof(MinidumpSimpleStringDictionary) +
                 sizeof(MinidumpSimpleStringDictionaryEntry) +
                 2 * sizeof(MinidumpUTF8String) + 1 + 3 + 1,  // 3 for padding
             file_writer.string().size());
 
   const MinidumpSimpleStringDictionary* dictionary =
       MinidumpSimpleStringDictionaryAtStart(file_writer.string(), 1);
   ASSERT_TRUE(dictionary);
   EXPECT_EQ(1u, dictionary->count);
   EXPECT_EQ(12u, dictionary->entries[0].key);
   EXPECT_EQ(20u, dictionary->entries[0].value);
   EXPECT_EQ("",
             MinidumpUTF8StringAtRVAAsString(file_writer.string(),
                                             dictionary->entries[0].key));
   EXPECT_EQ("",
             MinidumpUTF8StringAtRVAAsString(file_writer.string(),
                                             dictionary->entries[0].value));
 }
 
 TEST(MinidumpSimpleStringDictionaryWriter, OneKeyValue) {
   StringFileWriter file_writer;
 
   char kKey[] = "key";
   char kValue[] = "value";
 
   MinidumpSimpleStringDictionaryWriter dictionary_writer;
-  MinidumpSimpleStringDictionaryEntryWriter entry_writer;
-  entry_writer.SetKeyValue(kKey, kValue);
-  dictionary_writer.AddEntry(&entry_writer);
+  auto entry_writer =
+      make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter());
+  entry_writer->SetKeyValue(kKey, kValue);
+  dictionary_writer.AddEntry(entry_writer.Pass());
 
   EXPECT_TRUE(dictionary_writer.WriteEverything(&file_writer));
   ASSERT_EQ(sizeof(MinidumpSimpleStringDictionary) +
                 sizeof(MinidumpSimpleStringDictionaryEntry) +
                 2 * sizeof(MinidumpUTF8String) + sizeof(kKey) + sizeof(kValue),
             file_writer.string().size());
 
   const MinidumpSimpleStringDictionary* dictionary =
       MinidumpSimpleStringDictionaryAtStart(file_writer.string(), 1);
   ASSERT_TRUE(dictionary);
@@ skipping 12 matching lines @@
   StringFileWriter file_writer;
 
   char kKey0[] = "m0";
   char kValue0[] = "value0";
   char kKey1[] = "zzz1";
   char kValue1[] = "v1";
   char kKey2[] = "aa2";
   char kValue2[] = "val2";
 
   MinidumpSimpleStringDictionaryWriter dictionary_writer;
-  MinidumpSimpleStringDictionaryEntryWriter entry_writer_0;
-  entry_writer_0.SetKeyValue(kKey0, kValue0);
-  dictionary_writer.AddEntry(&entry_writer_0);
-  MinidumpSimpleStringDictionaryEntryWriter entry_writer_1;
-  entry_writer_1.SetKeyValue(kKey1, kValue1);
-  dictionary_writer.AddEntry(&entry_writer_1);
-  MinidumpSimpleStringDictionaryEntryWriter entry_writer_2;
-  entry_writer_2.SetKeyValue(kKey2, kValue2);
-  dictionary_writer.AddEntry(&entry_writer_2);
+  auto entry_writer_0 =
+      make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter());
+  entry_writer_0->SetKeyValue(kKey0, kValue0);
+  dictionary_writer.AddEntry(entry_writer_0.Pass());
+  auto entry_writer_1 =
+      make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter());
+  entry_writer_1->SetKeyValue(kKey1, kValue1);
+  dictionary_writer.AddEntry(entry_writer_1.Pass());
+  auto entry_writer_2 =
+      make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter());
+  entry_writer_2->SetKeyValue(kKey2, kValue2);
+  dictionary_writer.AddEntry(entry_writer_2.Pass());
 
   EXPECT_TRUE(dictionary_writer.WriteEverything(&file_writer));
   ASSERT_EQ(sizeof(MinidumpSimpleStringDictionary) +
                 3 * sizeof(MinidumpSimpleStringDictionaryEntry) +
                 6 * sizeof(MinidumpUTF8String) + sizeof(kKey2) +
                 sizeof(kValue2) + 3 + sizeof(kKey0) + 1 + sizeof(kValue0) + 1 +
                 sizeof(kKey1) + 3 + sizeof(kValue1),
             file_writer.string().size());
 
   const MinidumpSimpleStringDictionary* dictionary =
@@ skipping 34 matching lines @@
 }
 
 TEST(MinidumpSimpleStringDictionaryWriter, DuplicateKeyValue) {
   StringFileWriter file_writer;
 
   char kKey[] = "key";
   char kValue0[] = "fake_value";
   char kValue1[] = "value";
 
   MinidumpSimpleStringDictionaryWriter dictionary_writer;
-  MinidumpSimpleStringDictionaryEntryWriter entry_writer_0;
-  entry_writer_0.SetKeyValue(kKey, kValue0);
-  dictionary_writer.AddEntry(&entry_writer_0);
-  MinidumpSimpleStringDictionaryEntryWriter entry_writer_1;
-  entry_writer_1.SetKeyValue(kKey, kValue1);
-  dictionary_writer.AddEntry(&entry_writer_1);
+  auto entry_writer_0 =
+      make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter());
+  entry_writer_0->SetKeyValue(kKey, kValue0);
+  dictionary_writer.AddEntry(entry_writer_0.Pass());
+  auto entry_writer_1 =
+      make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter());
+  entry_writer_1->SetKeyValue(kKey, kValue1);
+  dictionary_writer.AddEntry(entry_writer_1.Pass());
 
   EXPECT_TRUE(dictionary_writer.WriteEverything(&file_writer));
   ASSERT_EQ(sizeof(MinidumpSimpleStringDictionary) +
                 sizeof(MinidumpSimpleStringDictionaryEntry) +
                 2 * sizeof(MinidumpUTF8String) + sizeof(kKey) + sizeof(kValue1),
             file_writer.string().size());
 
   const MinidumpSimpleStringDictionary* dictionary =
       MinidumpSimpleStringDictionaryAtStart(file_writer.string(), 1);
   ASSERT_TRUE(dictionary);
   EXPECT_EQ(1u, dictionary->count);
   EXPECT_EQ(12u, dictionary->entries[0].key);
   EXPECT_EQ(20u, dictionary->entries[0].value);
   EXPECT_EQ(kKey,
             MinidumpUTF8StringAtRVAAsString(file_writer.string(),
                                             dictionary->entries[0].key));
   EXPECT_EQ(kValue1,
             MinidumpUTF8StringAtRVAAsString(file_writer.string(),
                                             dictionary->entries[0].value));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad