MinidumpMemoryWriter test: Don’t suffix uint64_t constants

minidump/minidump_memory_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 168 matching lines @@
   std::string expected_data(expected->Memory.DataSize, value);
   std::string observed_data(&file_contents[observed->Memory.Rva],
                             observed->Memory.DataSize);
   EXPECT_EQ(expected_data, observed_data);
 }
 
 TEST(MinidumpMemoryWriter, OneMemoryRegion) {
   MinidumpFileWriter minidump_file_writer;
   MinidumpMemoryListWriter memory_list_writer;
 
-  const uint64_t kBaseAddress = 0xfedcba9876543210ull;
+  const uint64_t kBaseAddress = 0xfedcba9876543210;
   const uint64_t kSize = 0x1000;
   const uint8_t kValue = 'm';
 
   TestMemoryWriter memory_writer(kBaseAddress, kSize, kValue);
   memory_list_writer.AddMemory(&memory_writer);
 
   minidump_file_writer.AddStream(&memory_list_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
@@ skipping 15 matching lines @@
                                     &memory_list->MemoryRanges[0],
                                     file_writer.string(),
                                     kValue,
                                     true);
 }
 
 TEST(MinidumpMemoryWriter, TwoMemoryRegions) {
   MinidumpFileWriter minidump_file_writer;
   MinidumpMemoryListWriter memory_list_writer;
 
-  const uint64_t kBaseAddress1 = 0x00c0ffeeull;
+  const uint64_t kBaseAddress1 = 0xc0ffee;
   const uint64_t kSize1 = 0x0100;
   const uint8_t kValue1 = '6';
-  const uint64_t kBaseAddress2 = 0xfac00facull;
+  const uint64_t kBaseAddress2 = 0xfac00fac;
   const uint64_t kSize2 = 0x0200;
   const uint8_t kValue2 = '!';
 
   TestMemoryWriter memory_writer_1(kBaseAddress1, kSize1, kValue1);
   memory_list_writer.AddMemory(&memory_writer_1);
   TestMemoryWriter memory_writer_2(kBaseAddress2, kSize2, kValue2);
   memory_list_writer.AddMemory(&memory_writer_2);
 
   minidump_file_writer.AddStream(&memory_list_writer);
 
@@ skipping 69 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(TestMemoryStream);
 };
 
 TEST(MinidumpMemoryWriter, ExtraMemory) {
   // This tests MinidumpMemoryListWriter::AddExtraMemory(). That method adds
   // a MinidumpMemoryWriter to the MinidumpMemoryListWriter without making the
   // memory writer a child of the memory list writer.
   MinidumpFileWriter minidump_file_writer;
 
-  const uint64_t kBaseAddress1 = 0x0000000000001000ull;
+  const uint64_t kBaseAddress1 = 0x1000;
   const uint64_t kSize1 = 0x0400;
   const uint8_t kValue1 = '1';
   TestMemoryStream test_memory_stream(kBaseAddress1, kSize1, kValue1);
 
   MinidumpMemoryListWriter memory_list_writer;
   memory_list_writer.AddExtraMemory(test_memory_stream.memory());
 
   minidump_file_writer.AddStream(&test_memory_stream);
 
-  const uint64_t kBaseAddress2 = 0x0000000000002000ull;
+  const uint64_t kBaseAddress2 = 0x2000;
   const uint64_t kSize2 = 0x0400;
   const uint8_t kValue2 = 'm';
 
   TestMemoryWriter memory_writer(kBaseAddress2, kSize2, kValue2);
   memory_list_writer.AddMemory(&memory_writer);
 
   minidump_file_writer.AddStream(&memory_list_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
@@ skipping 24 matching lines @@
   expected.Memory.Rva = memory_list->MemoryRanges[0].Memory.Rva +
                         memory_list->MemoryRanges[0].Memory.DataSize;
   ExpectMemoryDescriptorAndContents(&expected,
                                     &memory_list->MemoryRanges[1],
                                     file_writer.string(),
                                     kValue2,
                                     true);
 }
 
 }  // namespace