minidump: Change the ownership model

minidump/minidump_module_writer.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 85 matching lines @@
     ~MinidumpModuleCodeViewRecordPDB70Writer() {
 }
 
 MinidumpModuleMiscDebugRecordWriter::MinidumpModuleMiscDebugRecordWriter()
     : internal::MinidumpWritable(),
       image_debug_misc_(),
       data_(),
       data_utf16_() {
 }
 
+MinidumpModuleMiscDebugRecordWriter::~MinidumpModuleMiscDebugRecordWriter() {
+}
+
 void MinidumpModuleMiscDebugRecordWriter::SetData(const std::string& data,
                                                   bool utf16) {
   DCHECK_EQ(state(), kStateMutable);
 
   if (!utf16) {
     data_utf16_.clear();
     image_debug_misc_.Unicode = 0;
     data_ = data;
   } else {
     data_.clear();
@@ skipping 76 matching lines @@
 void MinidumpModuleWriter::SetName(const std::string& name) {
   DCHECK_EQ(state(), kStateMutable);
 
   if (!name_) {
     name_.reset(new internal::MinidumpUTF16StringWriter());
   }
   name_->SetUTF8(name);
 }
 
 void MinidumpModuleWriter::SetCodeViewRecord(
-    MinidumpModuleCodeViewRecordWriter* codeview_record) {
+    scoped_ptr<MinidumpModuleCodeViewRecordWriter> codeview_record) {
   DCHECK_EQ(state(), kStateMutable);
 
-  codeview_record_ = codeview_record;
+  codeview_record_ = codeview_record.Pass();
 }
 
 void MinidumpModuleWriter::SetMiscDebugRecord(
-    MinidumpModuleMiscDebugRecordWriter* misc_debug_record) {
+    scoped_ptr<MinidumpModuleMiscDebugRecordWriter> misc_debug_record) {
   DCHECK_EQ(state(), kStateMutable);
 
-  misc_debug_record_ = misc_debug_record;
+  misc_debug_record_ = misc_debug_record.Pass();
 }
 
 void MinidumpModuleWriter::SetTimestamp(time_t timestamp) {
   DCHECK_EQ(state(), kStateMutable);
 
   internal::MinidumpWriterUtil::AssignTimeT(&module_.TimeDateStamp, timestamp);
 }
 
 void MinidumpModuleWriter::SetFileVersion(uint16_t version_0,
                                           uint16_t version_1,
@@ skipping 58 matching lines @@
   return 0;
 }
 
 std::vector<internal::MinidumpWritable*> MinidumpModuleWriter::Children() {
   DCHECK_GE(state(), kStateFrozen);
   DCHECK(name_);
 
   std::vector<MinidumpWritable*> children;
   children.push_back(name_.get());
   if (codeview_record_) {
-    children.push_back(codeview_record_);
+    children.push_back(codeview_record_.get());
   }
   if (misc_debug_record_) {
-    children.push_back(misc_debug_record_);
+    children.push_back(misc_debug_record_.get());
   }
 
   return children;
 }
 
 bool MinidumpModuleWriter::WriteObject(FileWriterInterface* file_writer) {
   DCHECK_EQ(state(), kStateWritable);
 
   // This object doesn’t directly write anything itself. Its MINIDUMP_MODULE is
   // written by its parent as part of a MINIDUMP_MODULE_LIST, and its children
   // are responsible for writing themselves.
   return true;
 }
 
 MinidumpModuleListWriter::MinidumpModuleListWriter()
     : MinidumpStreamWriter(), module_list_base_(), modules_() {
 }
 
 MinidumpModuleListWriter::~MinidumpModuleListWriter() {
 }
 
-void MinidumpModuleListWriter::AddModule(MinidumpModuleWriter* module) {
+void MinidumpModuleListWriter::AddModule(
+    scoped_ptr<MinidumpModuleWriter> module) {
   DCHECK_EQ(state(), kStateMutable);
 
-  modules_.push_back(module);
+  modules_.push_back(module.release());
 }
 
 bool MinidumpModuleListWriter::Freeze() {
   DCHECK_EQ(state(), kStateMutable);
 
   if (!MinidumpStreamWriter::Freeze()) {
     return false;
   }
 
   size_t module_count = modules_.size();
@@ skipping 37 matching lines @@
   }
 
   return file_writer->WriteIoVec(&iovecs);
 }
 
 MinidumpStreamType MinidumpModuleListWriter::StreamType() const {
   return kMinidumpStreamTypeModuleList;
 }
 
 }  // namespace crashpad