minidump: Change the ownership model

minidump/minidump_module_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 41 matching lines @@
       MinidumpModuleCrashpadInfoListAtStart(file_writer.string(), 0);
   ASSERT_TRUE(module_list);
 
   EXPECT_EQ(0u, module_list->count);
 }
 
 TEST(MinidumpModuleCrashpadInfoWriter, EmptyModule) {
   StringFileWriter file_writer;
 
   MinidumpModuleCrashpadInfoListWriter module_list_writer;
-  MinidumpModuleCrashpadInfoWriter module_writer;
-  module_list_writer.AddModule(&module_writer);
+  auto module_writer =
+      make_scoped_ptr(new MinidumpModuleCrashpadInfoWriter());
+  module_list_writer.AddModule(module_writer.Pass());
 
   EXPECT_TRUE(module_list_writer.WriteEverything(&file_writer));
   ASSERT_EQ(sizeof(MinidumpModuleCrashpadInfoList) +
                 sizeof(MINIDUMP_LOCATION_DESCRIPTOR) +
                 sizeof(MinidumpModuleCrashpadInfo),
             file_writer.string().size());
 
   const MinidumpModuleCrashpadInfoList* module_list =
       MinidumpModuleCrashpadInfoListAtStart(file_writer.string(), 1);
   ASSERT_TRUE(module_list);
@@ skipping 13 matching lines @@
 
 TEST(MinidumpModuleCrashpadInfoWriter, FullModule) {
   const uint32_t kMinidumpModuleListIndex = 1;
   const char kKey[] = "key";
   const char kValue[] = "value";
 
   StringFileWriter file_writer;
 
   MinidumpModuleCrashpadInfoListWriter module_list_writer;
 
-  MinidumpModuleCrashpadInfoWriter module_writer;
-  module_writer.SetMinidumpModuleListIndex(kMinidumpModuleListIndex);
-  MinidumpSimpleStringDictionaryWriter simple_string_dictionary_writer;
-  MinidumpSimpleStringDictionaryEntryWriter
-      simple_string_dictionary_entry_writer;
-  simple_string_dictionary_entry_writer.SetKeyValue(kKey, kValue);
-  simple_string_dictionary_writer.AddEntry(
-      &simple_string_dictionary_entry_writer);
-  module_writer.SetSimpleAnnotations(&simple_string_dictionary_writer);
-  module_list_writer.AddModule(&module_writer);
+  auto module_writer =
+      make_scoped_ptr(new MinidumpModuleCrashpadInfoWriter());
+  module_writer->SetMinidumpModuleListIndex(kMinidumpModuleListIndex);
+  auto simple_string_dictionary_writer =
+      make_scoped_ptr(new MinidumpSimpleStringDictionaryWriter());
+  auto simple_string_dictionary_entry_writer =
+      make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter());
+  simple_string_dictionary_entry_writer->SetKeyValue(kKey, kValue);
+  simple_string_dictionary_writer->AddEntry(
+      simple_string_dictionary_entry_writer.Pass());
+  module_writer->SetSimpleAnnotations(simple_string_dictionary_writer.Pass());
+  module_list_writer.AddModule(module_writer.Pass());
 
   EXPECT_TRUE(module_list_writer.WriteEverything(&file_writer));
   ASSERT_EQ(sizeof(MinidumpModuleCrashpadInfoList) +
                 sizeof(MINIDUMP_LOCATION_DESCRIPTOR) +
                 sizeof(MinidumpModuleCrashpadInfo) +
                 sizeof(MinidumpSimpleStringDictionary) +
                 sizeof(MinidumpSimpleStringDictionaryEntry) +
                 sizeof(MinidumpUTF8String) + arraysize(kKey) +
                 sizeof(MinidumpUTF8String) + arraysize(kValue),
             file_writer.string().size());
@@ skipping 36 matching lines @@
   const uint32_t kMinidumpModuleListIndex2 = 5;
   const char kKey2A[] = "K";
   const char kValue2A[] = "VVV";
   const char kKey2B[] = "river";
   const char kValue2B[] = "hudson";
 
   StringFileWriter file_writer;
 
   MinidumpModuleCrashpadInfoListWriter module_list_writer;
 
-  MinidumpModuleCrashpadInfoWriter module_writer_0;
-  module_writer_0.SetMinidumpModuleListIndex(kMinidumpModuleListIndex0);
-  MinidumpSimpleStringDictionaryWriter simple_string_dictionary_writer_0;
-  MinidumpSimpleStringDictionaryEntryWriter
-      simple_string_dictionary_entry_writer_0;
-  simple_string_dictionary_entry_writer_0.SetKeyValue(kKey0, kValue0);
-  simple_string_dictionary_writer_0.AddEntry(
-      &simple_string_dictionary_entry_writer_0);
-  module_writer_0.SetSimpleAnnotations(&simple_string_dictionary_writer_0);
-  module_list_writer.AddModule(&module_writer_0);
+  auto module_writer_0 =
+      make_scoped_ptr(new MinidumpModuleCrashpadInfoWriter());
+  module_writer_0->SetMinidumpModuleListIndex(kMinidumpModuleListIndex0);
+  auto simple_string_dictionary_writer_0 =
+      make_scoped_ptr(new MinidumpSimpleStringDictionaryWriter());
+  auto simple_string_dictionary_entry_writer_0 =
+      make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter());
+  simple_string_dictionary_entry_writer_0->SetKeyValue(kKey0, kValue0);
+  simple_string_dictionary_writer_0->AddEntry(
+      simple_string_dictionary_entry_writer_0.Pass());
+  module_writer_0->SetSimpleAnnotations(
+      simple_string_dictionary_writer_0.Pass());
+  module_list_writer.AddModule(module_writer_0.Pass());
 
-  MinidumpModuleCrashpadInfoWriter module_writer_1;
-  module_writer_1.SetMinidumpModuleListIndex(kMinidumpModuleListIndex1);
-  module_list_writer.AddModule(&module_writer_1);
+  auto module_writer_1 =
+      make_scoped_ptr(new MinidumpModuleCrashpadInfoWriter());
+  module_writer_1->SetMinidumpModuleListIndex(kMinidumpModuleListIndex1);
+  module_list_writer.AddModule(module_writer_1.Pass());
 
-  MinidumpModuleCrashpadInfoWriter module_writer_2;
-  module_writer_2.SetMinidumpModuleListIndex(kMinidumpModuleListIndex2);
-  MinidumpSimpleStringDictionaryWriter simple_string_dictionary_writer_2;
-  MinidumpSimpleStringDictionaryEntryWriter
-      simple_string_dictionary_entry_writer_2a;
-  simple_string_dictionary_entry_writer_2a.SetKeyValue(kKey2A, kValue2A);
-  simple_string_dictionary_writer_2.AddEntry(
-      &simple_string_dictionary_entry_writer_2a);
-  MinidumpSimpleStringDictionaryEntryWriter
-      simple_string_dictionary_entry_writer_2b;
-  simple_string_dictionary_entry_writer_2b.SetKeyValue(kKey2B, kValue2B);
-  simple_string_dictionary_writer_2.AddEntry(
-      &simple_string_dictionary_entry_writer_2b);
-  module_writer_2.SetSimpleAnnotations(&simple_string_dictionary_writer_2);
-  module_list_writer.AddModule(&module_writer_2);
+  auto module_writer_2 =
+      make_scoped_ptr(new MinidumpModuleCrashpadInfoWriter());
+  module_writer_2->SetMinidumpModuleListIndex(kMinidumpModuleListIndex2);
+  auto simple_string_dictionary_writer_2 =
+      make_scoped_ptr(new MinidumpSimpleStringDictionaryWriter());
+  auto simple_string_dictionary_entry_writer_2a =
+      make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter());
+  simple_string_dictionary_entry_writer_2a->SetKeyValue(kKey2A, kValue2A);
+  simple_string_dictionary_writer_2->AddEntry(
+      simple_string_dictionary_entry_writer_2a.Pass());
+  auto simple_string_dictionary_entry_writer_2b =
+      make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter());
+  simple_string_dictionary_entry_writer_2b->SetKeyValue(kKey2B, kValue2B);
+  simple_string_dictionary_writer_2->AddEntry(
+      simple_string_dictionary_entry_writer_2b.Pass());
+  module_writer_2->SetSimpleAnnotations(
+      simple_string_dictionary_writer_2.Pass());
+  module_list_writer.AddModule(module_writer_2.Pass());
 
   EXPECT_TRUE(module_list_writer.WriteEverything(&file_writer));
 
   const MinidumpModuleCrashpadInfoList* module_list =
       MinidumpModuleCrashpadInfoListAtStart(file_writer.string(), 3);
   ASSERT_TRUE(module_list);
 
   ASSERT_EQ(3u, module_list->count);
 
   const MinidumpModuleCrashpadInfo* module_0 =
@@ skipping 54 matching lines @@
             MinidumpUTF8StringAtRVAAsString(
                 file_writer.string(), simple_annotations_2->entries[1].key));
   EXPECT_EQ(kValue2B,
             MinidumpUTF8StringAtRVAAsString(
                 file_writer.string(), simple_annotations_2->entries[1].value));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad