Fix a bunch of issues blocking 64-bit orderfile generation.

tools/cygprofile/cygprofile_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "tools/cygprofile/cygprofile.h"
 
 #include <vector>
 
 #include <sys/time.h>
 
@@ skipping 28 matching lines @@
 
   thread_log.AddEntry(reinterpret_cast<void*>(0x2));
   thread_log.AddEntry(reinterpret_cast<void*>(0x1));
 
   std::vector<LogEntry> entries;
   thread_log.TakeEntries(&entries);
 
   ASSERT_EQ(2U, entries.size());
   // The entries should appear in their insertion order.
   const LogEntry& first_entry = entries[0];
-  ASSERT_EQ(reinterpret_cast<int>(first_entry.address), 2);
+  ASSERT_EQ(reinterpret_cast<long>(first_entry.address), 2);

[Benoit L, 2015/02/04 17:12:57]

nit: uintptr_t is probably the most appropriate type here. It might not be
defined everywhere, but I believe that we are fine with our compilers.

[azarchs, 2015/02/04 17:49:54]

Done.

   ASSERT_EQ(getpid(), first_entry.pid);
   ASSERT_LT(0, first_entry.tid);
 
   const LogEntry& second_entry = entries[1];
-  ASSERT_EQ(1, reinterpret_cast<int>(second_entry.address));
+  ASSERT_EQ(1, reinterpret_cast<long>(second_entry.address));
   ASSERT_EQ(first_entry.pid, second_entry.pid);
   ASSERT_EQ(first_entry.tid, second_entry.tid);
 
   ASSERT_GE(GetUsecSecTimeFromTimeSpec(second_entry.time),
             GetUsecSecTimeFromTimeSpec(first_entry.time));
 }
 
 TEST(CygprofileTest, ManagerBasic) {
   base::WaitableEvent wait_event(true, false);
   base::WaitableEvent notify_event(true, false);
@@ skipping 15 matching lines @@
   manager.AddLog(thread_log.Pass());
 
   EXPECT_EQ(0U, entries.size());
   // This will wake up the internal thread.
   wait_event.Signal();
   // Now it's our turn to wait until it performed the flush.
   notify_event.Wait();
 
   // The flush should have moved the data to the local vector of entries.
   EXPECT_EQ(2U, entries.size());
-  ASSERT_EQ(2, reinterpret_cast<int>(entries[0].address));
-  ASSERT_EQ(3, reinterpret_cast<int>(entries[1].address));
+  ASSERT_EQ(2, reinterpret_cast<long>(entries[0].address));
+  ASSERT_EQ(3, reinterpret_cast<long>(entries[1].address));
 }
 
 }  // namespace
 }  // namespace cygprofile
 
 // Custom runner implementation since base's one requires JNI on Android.
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }