Fixing remaining VC++ 2015 64-bit build breaks

third_party/WebKit/Source/platform/TraceEvent.h

Index: third_party/WebKit/Source/platform/TraceEvent.h
diff --git a/third_party/WebKit/Source/platform/TraceEvent.h b/third_party/WebKit/Source/platform/TraceEvent.h
index c7eda727580cb5d26954f95ce0d12cb2a9f95b91..20b6b7bc17caaa5fd2bf686401dbbb25811e5311 100644
--- a/third_party/WebKit/Source/platform/TraceEvent.h
+++ b/third_party/WebKit/Source/platform/TraceEvent.h
@@ -269,8 +269,8 @@ public:
     typedef MangleBehavior<false> DontMangle;
     typedef MangleBehavior<true> ForceMangle;
 
-    TraceID(const void* id, unsigned* flags) :
-        m_data(static_cast<unsigned long long>(reinterpret_cast<unsigned long>(id)))
+    TraceID(const void* id, unsigned* flags)
+        : m_data(static_cast<unsigned long long>(reinterpret_cast<uintptr_t>(id)))

[Nico, 2015/11/16 21:31:07]

either cast to unsigned long long or change m_data to uintptr_t (which would
make it 32-bit on 32-bit systems)

[brucedawson, 2015/11/17 00:24:39]

The reason for leaving it as-is is that TraceID can be initialized with an
unsigned long long (so m_id can't be uintptr_t) and the double cast matches the
canonical version in base\trace_event.h (which this had diverged from).

I'd initially cast to uintptr_t and let the conversion to unsigned long long be
implicit, but wfh@ complained:
https://codereview.chromium.org/1422773008/diff/120001/third_party/WebKit/Sou...

At least all of the variants should be correct.

     {
         *flags |= TRACE_EVENT_FLAG_MANGLE_ID;
     }