Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1265)

Unified Diff: third_party/crashpad/crashpad/minidump/test/minidump_memory_writer_test_util.cc

Issue 2349083002: Update Crashpad to 23d31c4fea61962e156f992889c6b041ad757d12 (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/crashpad/crashpad/minidump/test/minidump_memory_writer_test_util.cc
diff --git a/third_party/crashpad/crashpad/minidump/test/minidump_memory_writer_test_util.cc b/third_party/crashpad/crashpad/minidump/test/minidump_memory_writer_test_util.cc
index 4944e6dfda97d26467122f62883c8b8772c6370d..3b94b9c85e9ea235b11631db8032f818cd311f9b 100644
--- a/third_party/crashpad/crashpad/minidump/test/minidump_memory_writer_test_util.cc
+++ b/third_party/crashpad/crashpad/minidump/test/minidump_memory_writer_test_util.cc
@@ -22,48 +22,15 @@ namespace test {
TestMinidumpMemoryWriter::TestMinidumpMemoryWriter(uint64_t base_address,
size_t size,
uint8_t value)
- : MinidumpMemoryWriter(),
- base_address_(base_address),
- expected_offset_(-1),
- size_(size),
- value_(value) {
+ : SnapshotMinidumpMemoryWriter(&test_snapshot_) {
+ test_snapshot_.SetAddress(base_address);
+ test_snapshot_.SetSize(size);
+ test_snapshot_.SetValue(value);
}
TestMinidumpMemoryWriter::~TestMinidumpMemoryWriter() {
}
-uint64_t TestMinidumpMemoryWriter::MemoryRangeBaseAddress() const {
- EXPECT_EQ(state(), kStateFrozen);
- return base_address_;
-}
-
-size_t TestMinidumpMemoryWriter::MemoryRangeSize() const {
- EXPECT_GE(state(), kStateFrozen);
- return size_;
-}
-
-bool TestMinidumpMemoryWriter::WillWriteAtOffsetImpl(FileOffset offset) {
- EXPECT_EQ(state(), kStateFrozen);
- expected_offset_ = offset;
- bool rv = MinidumpMemoryWriter::WillWriteAtOffsetImpl(offset);
- EXPECT_TRUE(rv);
- return rv;
-}
-
-bool TestMinidumpMemoryWriter::WriteObject(FileWriterInterface* file_writer) {
- EXPECT_EQ(state(), kStateWritable);
- EXPECT_EQ(expected_offset_, file_writer->Seek(0, SEEK_CUR));
-
- bool rv = true;
- if (size_ > 0) {
- std::string data(size_, value_);
- rv = file_writer->Write(&data[0], size_);
- EXPECT_TRUE(rv);
- }
-
- return rv;
-}
-
void ExpectMinidumpMemoryDescriptor(
const MINIDUMP_MEMORY_DESCRIPTOR* expected,
const MINIDUMP_MEMORY_DESCRIPTOR* observed) {

Powered by Google App Engine
This is Rietveld 408576698