minidump: Change the ownership model

minidump/minidump_file_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 33 matching lines @@
   EXPECT_FALSE(directory);
 }
 
 class TestStream final : public internal::MinidumpStreamWriter {
  public:
   TestStream(MinidumpStreamType stream_type,
              size_t stream_size,
              uint8_t stream_value)
       : stream_data_(stream_size, stream_value), stream_type_(stream_type) {}
 
-  ~TestStream() {}
+  ~TestStream() override {}
 
   // MinidumpStreamWriter:
   MinidumpStreamType StreamType() const override {
     return stream_type_;
   }
 
  protected:
   // MinidumpWritable:
   size_t SizeOfObject() override {
     EXPECT_GE(state(), kStateFrozen);
@@ skipping 13 matching lines @@
 };
 
 TEST(MinidumpFileWriter, OneStream) {
   MinidumpFileWriter minidump_file;
   const time_t kTimestamp = 0x155d2fb8;
   minidump_file.SetTimestamp(kTimestamp);
 
   const size_t kStreamSize = 5;
   const MinidumpStreamType kStreamType = static_cast<MinidumpStreamType>(0x4d);
   const uint8_t kStreamValue = 0x5a;
-  TestStream stream(kStreamType, kStreamSize, kStreamValue);
-  minidump_file.AddStream(&stream);
+  auto stream =
+      make_scoped_ptr(new TestStream(kStreamType, kStreamSize, kStreamValue));
+  minidump_file.AddStream(stream.Pass());
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file.WriteEverything(&file_writer));
 
   const size_t kDirectoryOffset = sizeof(MINIDUMP_HEADER);
   const size_t kStreamOffset = kDirectoryOffset + sizeof(MINIDUMP_DIRECTORY);
   const size_t kFileSize = kStreamOffset + kStreamSize;
 
   ASSERT_EQ(kFileSize, file_writer.string().size());
 
@@ skipping 16 matching lines @@
 }
 
 TEST(MinidumpFileWriter, ThreeStreams) {
   MinidumpFileWriter minidump_file;
   const time_t kTimestamp = 0x155d2fb8;
   minidump_file.SetTimestamp(kTimestamp);
 
   const size_t kStream0Size = 5;
   const MinidumpStreamType kStream0Type = static_cast<MinidumpStreamType>(0x6d);
   const uint8_t kStream0Value = 0x5a;
-  TestStream stream0(kStream0Type, kStream0Size, kStream0Value);
-  minidump_file.AddStream(&stream0);
+  auto stream0 = make_scoped_ptr(
+      new TestStream(kStream0Type, kStream0Size, kStream0Value));
+  minidump_file.AddStream(stream0.Pass());
 
   // Make the second stream’s type be a smaller quantity than the first stream’s
   // to test that the streams show up in the order that they were added, not in
   // numeric order.
   const size_t kStream1Size = 3;
   const MinidumpStreamType kStream1Type = static_cast<MinidumpStreamType>(0x4d);
   const uint8_t kStream1Value = 0xa5;
-  TestStream stream1(kStream1Type, kStream1Size, kStream1Value);
-  minidump_file.AddStream(&stream1);
+  auto stream1 = make_scoped_ptr(
+      new TestStream(kStream1Type, kStream1Size, kStream1Value));
+  minidump_file.AddStream(stream1.Pass());
 
   const size_t kStream2Size = 1;
   const MinidumpStreamType kStream2Type = static_cast<MinidumpStreamType>(0x7e);
   const uint8_t kStream2Value = 0x36;
-  TestStream stream2(kStream2Type, kStream2Size, kStream2Value);
-  minidump_file.AddStream(&stream2);
+  auto stream2 = make_scoped_ptr(
+      new TestStream(kStream2Type, kStream2Size, kStream2Value));
+  minidump_file.AddStream(stream2.Pass());
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file.WriteEverything(&file_writer));
 
   const size_t kDirectoryOffset = sizeof(MINIDUMP_HEADER);
   const size_t kStream0Offset =
       kDirectoryOffset + 3 * sizeof(MINIDUMP_DIRECTORY);
   const size_t kStream1Padding = 3;
   const size_t kStream1Offset = kStream0Offset + kStream0Size + kStream1Padding;
   const size_t kStream2Padding = 1;
@@ skipping 45 matching lines @@
 
   std::string expected_stream2(kStream2Size, kStream2Value);
   EXPECT_EQ(0, memcmp(stream2_data, expected_stream2.c_str(), kStream2Size));
 }
 
 TEST(MinidumpFileWriter, ZeroLengthStream) {
   MinidumpFileWriter minidump_file;
 
   const size_t kStreamSize = 0;
   const MinidumpStreamType kStreamType = static_cast<MinidumpStreamType>(0x4d);
-  TestStream stream(kStreamType, kStreamSize, 0);
-  minidump_file.AddStream(&stream);
+  auto stream = make_scoped_ptr(new TestStream(kStreamType, kStreamSize, 0));
+  minidump_file.AddStream(stream.Pass());
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file.WriteEverything(&file_writer));
 
   const size_t kDirectoryOffset = sizeof(MINIDUMP_HEADER);
   const size_t kStreamOffset = kDirectoryOffset + sizeof(MINIDUMP_DIRECTORY);
   const size_t kFileSize = kStreamOffset + kStreamSize;
 
   ASSERT_EQ(kFileSize, file_writer.string().size());
 
   const MINIDUMP_DIRECTORY* directory;
   const MINIDUMP_HEADER* header =
       MinidumpHeaderAtStart(file_writer.string(), &directory);
   ASSERT_NO_FATAL_FAILURE(VerifyMinidumpHeader(header, 1, 0));
   ASSERT_TRUE(directory);
 
   EXPECT_EQ(kStreamType, directory[0].StreamType);
   EXPECT_EQ(kStreamSize, directory[0].Location.DataSize);
   EXPECT_EQ(kStreamOffset, directory[0].Location.Rva);
 }
 
 TEST(MinidumpFileWriterDeathTest, SameStreamType) {
   MinidumpFileWriter minidump_file;
 
   const size_t kStream0Size = 5;
   const MinidumpStreamType kStream0Type = static_cast<MinidumpStreamType>(0x4d);
   const uint8_t kStream0Value = 0x5a;
-  TestStream stream0(kStream0Type, kStream0Size, kStream0Value);
-  minidump_file.AddStream(&stream0);
+  auto stream0 = make_scoped_ptr(
+      new TestStream(kStream0Type, kStream0Size, kStream0Value));
+  minidump_file.AddStream(stream0.Pass());
 
   // It is an error to add a second stream of the same type.
   const size_t kStream1Size = 3;
   const MinidumpStreamType kStream1Type = static_cast<MinidumpStreamType>(0x4d);
   const uint8_t kStream1Value = 0xa5;
-  TestStream stream1(kStream1Type, kStream1Size, kStream1Value);
-  ASSERT_DEATH(minidump_file.AddStream(&stream1), "already present");
+  auto stream1 = make_scoped_ptr(
+      new TestStream(kStream1Type, kStream1Size, kStream1Value));
+  ASSERT_DEATH(minidump_file.AddStream(stream1.Pass()), "already present");
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad