minidump: Change the ownership model

minidump/minidump_module_crashpad_info_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 14 matching lines @@
 
 MinidumpModuleCrashpadInfoWriter::MinidumpModuleCrashpadInfoWriter()
     : MinidumpWritable(), module_(), simple_annotations_() {
   module_.version = MinidumpModuleCrashpadInfo::kVersion;
 }
 
 MinidumpModuleCrashpadInfoWriter::~MinidumpModuleCrashpadInfoWriter() {
 }
 
 void MinidumpModuleCrashpadInfoWriter::SetSimpleAnnotations(
-    MinidumpSimpleStringDictionaryWriter* simple_annotations) {
+    scoped_ptr<MinidumpSimpleStringDictionaryWriter> simple_annotations) {
   DCHECK_EQ(state(), kStateMutable);
 
-  simple_annotations_ = simple_annotations;
+  simple_annotations_ = simple_annotations.Pass();
 }
 
 bool MinidumpModuleCrashpadInfoWriter::Freeze() {
   DCHECK_EQ(state(), kStateMutable);
 
   if (!MinidumpWritable::Freeze()) {
     return false;
   }
 
   if (simple_annotations_) {
     simple_annotations_->RegisterLocationDescriptor(
         &module_.simple_annotations);
   }
 
   return true;
 }
 
 size_t MinidumpModuleCrashpadInfoWriter::SizeOfObject() {
   DCHECK_GE(state(), kStateFrozen);
 
   return sizeof(module_);
 }
 
 std::vector<internal::MinidumpWritable*>
 MinidumpModuleCrashpadInfoWriter::Children() {
   DCHECK_GE(state(), kStateFrozen);
 
   std::vector<MinidumpWritable*> children;
   if (simple_annotations_) {
-    children.push_back(simple_annotations_);
+    children.push_back(simple_annotations_.get());
   }
 
   return children;
 }
 
 bool MinidumpModuleCrashpadInfoWriter::WriteObject(
     FileWriterInterface* file_writer) {
   DCHECK_EQ(state(), kStateWritable);
 
   return file_writer->Write(&module_, sizeof(module_));
 }
 
 MinidumpModuleCrashpadInfoListWriter::MinidumpModuleCrashpadInfoListWriter()
     : MinidumpWritable(),
       module_list_base_(),
       modules_(),
       module_location_descriptors_() {
 }
 
 MinidumpModuleCrashpadInfoListWriter::~MinidumpModuleCrashpadInfoListWriter() {
 }
 
 void MinidumpModuleCrashpadInfoListWriter::AddModule(
-    MinidumpModuleCrashpadInfoWriter* module) {
+    scoped_ptr<MinidumpModuleCrashpadInfoWriter> module) {
   DCHECK_EQ(state(), kStateMutable);
 
-  modules_.push_back(module);
+  modules_.push_back(module.release());
 }
 
 bool MinidumpModuleCrashpadInfoListWriter::Freeze() {
   DCHECK_EQ(state(), kStateMutable);
   DCHECK(module_location_descriptors_.empty());
 
   if (!MinidumpWritable::Freeze()) {
     return false;
   }
 
@@ skipping 45 matching lines @@
     iov.iov_base = &module_location_descriptors_[0];
     iov.iov_len = module_location_descriptors_.size() *
                   sizeof(MINIDUMP_LOCATION_DESCRIPTOR);
     iovecs.push_back(iov);
   }
 
   return file_writer->WriteIoVec(&iovecs);
 }
 
 }  // namespace crashpad