Index: client/crash_report_database_win.cc |
diff --git a/client/crash_report_database_win.cc b/client/crash_report_database_win.cc |
index 28a64bc935e242fead7cf5b3618618608383bbe1..6dbaf0ea7b696c52eddf08c40013f6ddf3ef04a1 100644 |
--- a/client/crash_report_database_win.cc |
+++ b/client/crash_report_database_win.cc |
@@ -576,12 +576,9 @@ OperationStatus CrashReportDatabaseWin::PrepareNewCrashReport( |
::UUID system_uuid; |
if (UuidCreate(&system_uuid) != RPC_S_OK) |
return kFileSystemError; |
- static_assert(sizeof(system_uuid) == 16, "unexpected system uuid size"); |
- static_assert(offsetof(::UUID, Data1) == 0, "unexpected uuid layout"); |
scoped_ptr<NewReport> new_report(new NewReport()); |
- new_report->uuid.InitializeFromBytes( |
- reinterpret_cast<const uint8_t*>(&system_uuid.Data1)); |
+ new_report->uuid.InitializeFromSystemUUID(&system_uuid); |
new_report->path = base_dir_.Append(kReportsDirectory) |
.Append(new_report->uuid.ToString16() + L"." + |
kCrashReportFileExtension); |