win: Fixes for minidump_misc_info_writer_test.cc

minidump/minidump_misc_info_writer_test.cc

Index: minidump/minidump_misc_info_writer_test.cc
diff --git a/minidump/minidump_misc_info_writer_test.cc b/minidump/minidump_misc_info_writer_test.cc
index b3773fedef7940e4f954c3b210e88b2d2a107248..3b8db74235b9a6eb0c6fc13c2b54e68b07138e5c 100644
--- a/minidump/minidump_misc_info_writer_test.cc
+++ b/minidump/minidump_misc_info_writer_test.cc
@@ -99,7 +99,9 @@ template <>
 void ExpectMiscInfoEqual<MINIDUMP_MISC_INFO_2>(
     const MINIDUMP_MISC_INFO_2* expected,
     const MINIDUMP_MISC_INFO_2* observed) {
-  ExpectMiscInfoEqual<MINIDUMP_MISC_INFO>(expected, observed);
+  ExpectMiscInfoEqual<MINIDUMP_MISC_INFO>(
+      reinterpret_cast<const MINIDUMP_MISC_INFO*>(expected),
+      reinterpret_cast<const MINIDUMP_MISC_INFO*>(observed));
   EXPECT_EQ(expected->ProcessorMaxMhz, observed->ProcessorMaxMhz);
   EXPECT_EQ(expected->ProcessorCurrentMhz, observed->ProcessorCurrentMhz);
   EXPECT_EQ(expected->ProcessorMhzLimit, observed->ProcessorMhzLimit);
@@ -112,7 +114,9 @@ template <>
 void ExpectMiscInfoEqual<MINIDUMP_MISC_INFO_3>(
     const MINIDUMP_MISC_INFO_3* expected,
     const MINIDUMP_MISC_INFO_3* observed) {
-  ExpectMiscInfoEqual<MINIDUMP_MISC_INFO_2>(expected, observed);
+  ExpectMiscInfoEqual<MINIDUMP_MISC_INFO_2>(
+      reinterpret_cast<const MINIDUMP_MISC_INFO_2*>(expected),
+      reinterpret_cast<const MINIDUMP_MISC_INFO_2*>(observed));
   EXPECT_EQ(expected->ProcessIntegrityLevel, observed->ProcessIntegrityLevel);
   EXPECT_EQ(expected->ProcessExecuteFlags, observed->ProcessExecuteFlags);
   EXPECT_EQ(expected->ProtectedProcess, observed->ProtectedProcess);
@@ -142,7 +146,9 @@ template <>
 void ExpectMiscInfoEqual<MINIDUMP_MISC_INFO_4>(
     const MINIDUMP_MISC_INFO_4* expected,
     const MINIDUMP_MISC_INFO_4* observed) {
-  ExpectMiscInfoEqual<MINIDUMP_MISC_INFO_3>(expected, observed);
+  ExpectMiscInfoEqual<MINIDUMP_MISC_INFO_3>(
+      reinterpret_cast<const MINIDUMP_MISC_INFO_3*>(expected),
+      reinterpret_cast<const MINIDUMP_MISC_INFO_3*>(observed));
   {
     SCOPED_TRACE("BuildString");
     ExpectNULPaddedString16Equal(expected->BuildString,
@@ -392,12 +398,10 @@ TEST(MinidumpMiscInfoWriter, TimeZoneStringsOverflow) {
 
   const uint32_t kTimeZoneId = 2;
   const int32_t kBias = 300;
-  std::string standard_name(
-      arraysize(decltype(MINIDUMP_MISC_INFO_N::TimeZone)::StandardName) + 1,
-      's');
+  MINIDUMP_MISC_INFO_N tmp; (void)tmp;

[Mark Mentovai, 2015/02/05 14:31:35]

Add ALLOW_UNUSED_LOCAL to mini_chromium and use it here. See
https://codereview.chromium.org/886143004/ too.

[scottmg, 2015/02/05 17:04:28]

Done.

+  std::string standard_name(arraysize(tmp.TimeZone.StandardName) + 1, 's');
   const int32_t kStandardBias = 0;
-  std::string daylight_name(
-      arraysize(decltype(MINIDUMP_MISC_INFO_N::TimeZone)::DaylightName), 'd');
+  std::string daylight_name(arraysize(tmp.TimeZone.DaylightName), 'd');
   const int32_t kDaylightBias = -60;
 
   // Test using kSystemTimeZero, because not all platforms will be able to
@@ -484,10 +488,9 @@ TEST(MinidumpMiscInfoWriter, BuildStringsOverflow) {
   MinidumpFileWriter minidump_file_writer;
   auto misc_info_writer = make_scoped_ptr(new MinidumpMiscInfoWriter());
 
-  std::string build_string(arraysize(MINIDUMP_MISC_INFO_N::BuildString) + 1,
-                           'B');
-  std::string debug_build_string(arraysize(MINIDUMP_MISC_INFO_N::DbgBldStr),
-                                 'D');
+  MINIDUMP_MISC_INFO_4 tmp; (void)tmp;

[Mark Mentovai, 2015/02/05 14:31:35]

Here too.

[scottmg, 2015/02/05 17:04:28]

Done.

+  std::string build_string(arraysize(tmp.BuildString) + 1, 'B');

[Mark Mentovai, 2015/02/05 14:31:35]

Nice, the local variable makes these lines less ugly.

+  std::string debug_build_string(arraysize(tmp.DbgBldStr), 'D');
 
   misc_info_writer->SetBuildString(build_string, debug_build_string);
 
@@ -670,11 +673,11 @@ TEST(MinidumpMiscInfoWriter, InitializeFromSnapshot) {
           arraysize(expect_misc_info.DbgBldStr));
 
   const timeval kStartTime =
-      { implicit_cast<time_t>(expect_misc_info.ProcessCreateTime), 0 };
+      { static_cast<time_t>(expect_misc_info.ProcessCreateTime), 0 };
   const timeval kUserCPUTime =
-      { implicit_cast<time_t>(expect_misc_info.ProcessUserTime), 0 };
+      { static_cast<time_t>(expect_misc_info.ProcessUserTime), 0 };
   const timeval kSystemCPUTime =
-      { implicit_cast<time_t>(expect_misc_info.ProcessKernelTime), 0 };
+      { static_cast<time_t>(expect_misc_info.ProcessKernelTime), 0 };
 
   TestProcessSnapshot process_snapshot;
   process_snapshot.SetProcessID(expect_misc_info.ProcessId);
@@ -682,7 +685,7 @@ TEST(MinidumpMiscInfoWriter, InitializeFromSnapshot) {
   process_snapshot.SetProcessCPUTimes(kUserCPUTime, kSystemCPUTime);
 
   auto system_snapshot = make_scoped_ptr(new TestSystemSnapshot());
-  const uint64_t kHzPerMHz = 1E6;
+  const uint64_t kHzPerMHz = static_cast<uint64_t>(1E6);
   system_snapshot->SetCPUFrequency(
       expect_misc_info.ProcessorCurrentMhz * kHzPerMHz,
       expect_misc_info.ProcessorMaxMhz * kHzPerMHz);