| Index: third_party/crashpad/crashpad/minidump/minidump_exception_writer_test.cc
|
| diff --git a/third_party/crashpad/crashpad/minidump/minidump_exception_writer_test.cc b/third_party/crashpad/crashpad/minidump/minidump_exception_writer_test.cc
|
| index 613c5dd1507af2492b6ab84f42e953d1c3884869..f2c0816dc45cc1e211707c9ebfedc4961e1cc08d 100644
|
| --- a/third_party/crashpad/crashpad/minidump/minidump_exception_writer_test.cc
|
| +++ b/third_party/crashpad/crashpad/minidump/minidump_exception_writer_test.cc
|
| @@ -45,15 +45,15 @@ void GetExceptionStream(const std::string& file_contents,
|
| const size_t kContextOffset =
|
| kExceptionStreamOffset + sizeof(MINIDUMP_EXCEPTION_STREAM);
|
| const size_t kFileSize = kContextOffset + sizeof(MinidumpContextX86);
|
| - ASSERT_EQ(file_contents.size(), kFileSize);
|
| + ASSERT_EQ(kFileSize, file_contents.size());
|
|
|
| const MINIDUMP_DIRECTORY* directory;
|
| const MINIDUMP_HEADER* header =
|
| MinidumpHeaderAtStart(file_contents, &directory);
|
| ASSERT_NO_FATAL_FAILURE(VerifyMinidumpHeader(header, 1, 0));
|
|
|
| - ASSERT_EQ(kMinidumpStreamTypeException, directory[0].StreamType);
|
| - EXPECT_EQ(kExceptionStreamOffset, directory[0].Location.Rva);
|
| + ASSERT_EQ(directory[0].StreamType, kMinidumpStreamTypeException);
|
| + EXPECT_EQ(directory[0].Location.Rva, kExceptionStreamOffset);
|
|
|
| *exception_stream =
|
| MinidumpWritableAtLocationDescriptor<MINIDUMP_EXCEPTION_STREAM>(
|
| @@ -68,24 +68,24 @@ void ExpectExceptionStream(const MINIDUMP_EXCEPTION_STREAM* expected,
|
| const MINIDUMP_EXCEPTION_STREAM* observed,
|
| const std::string& file_contents,
|
| const MinidumpContextX86** context) {
|
| - EXPECT_EQ(expected->ThreadId, observed->ThreadId);
|
| - EXPECT_EQ(0u, observed->__alignment);
|
| - EXPECT_EQ(expected->ExceptionRecord.ExceptionCode,
|
| - observed->ExceptionRecord.ExceptionCode);
|
| - EXPECT_EQ(expected->ExceptionRecord.ExceptionFlags,
|
| - observed->ExceptionRecord.ExceptionFlags);
|
| - EXPECT_EQ(expected->ExceptionRecord.ExceptionRecord,
|
| - observed->ExceptionRecord.ExceptionRecord);
|
| - EXPECT_EQ(expected->ExceptionRecord.ExceptionAddress,
|
| - observed->ExceptionRecord.ExceptionAddress);
|
| - EXPECT_EQ(expected->ExceptionRecord.NumberParameters,
|
| - observed->ExceptionRecord.NumberParameters);
|
| - EXPECT_EQ(0u, observed->ExceptionRecord.__unusedAlignment);
|
| + EXPECT_EQ(observed->ThreadId, expected->ThreadId);
|
| + EXPECT_EQ(observed->__alignment, 0u);
|
| + EXPECT_EQ(observed->ExceptionRecord.ExceptionCode,
|
| + expected->ExceptionRecord.ExceptionCode);
|
| + EXPECT_EQ(observed->ExceptionRecord.ExceptionFlags,
|
| + expected->ExceptionRecord.ExceptionFlags);
|
| + EXPECT_EQ(observed->ExceptionRecord.ExceptionRecord,
|
| + expected->ExceptionRecord.ExceptionRecord);
|
| + EXPECT_EQ(observed->ExceptionRecord.ExceptionAddress,
|
| + expected->ExceptionRecord.ExceptionAddress);
|
| + EXPECT_EQ(observed->ExceptionRecord.NumberParameters,
|
| + expected->ExceptionRecord.NumberParameters);
|
| + EXPECT_EQ(observed->ExceptionRecord.__unusedAlignment, 0u);
|
| for (size_t index = 0;
|
| index < arraysize(observed->ExceptionRecord.ExceptionInformation);
|
| ++index) {
|
| - EXPECT_EQ(expected->ExceptionRecord.ExceptionInformation[index],
|
| - observed->ExceptionRecord.ExceptionInformation[index]);
|
| + EXPECT_EQ(observed->ExceptionRecord.ExceptionInformation[index],
|
| + expected->ExceptionRecord.ExceptionInformation[index]);
|
| }
|
| *context = MinidumpWritableAtLocationDescriptor<MinidumpContextX86>(
|
| file_contents, observed->ThreadContext);
|
|
|