Fixing remaining VC++ 2015 64-bit build breaks

chrome/app/chrome_watcher_client_unittest_win.cc

Index: chrome/app/chrome_watcher_client_unittest_win.cc
diff --git a/chrome/app/chrome_watcher_client_unittest_win.cc b/chrome/app/chrome_watcher_client_unittest_win.cc
index e3549e990150687b77da4367bae7777dfc646f72..ec6db07eaa2c5dc5440aba4386118ef3fc2038f0 100644
--- a/chrome/app/chrome_watcher_client_unittest_win.cc
+++ b/chrome/app/chrome_watcher_client_unittest_win.cc
@@ -23,6 +23,10 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
 
+#if defined(OS_WIN)

[brettw, 2015/11/18 19:24:16]

This file is named "_win.cc". I don't think we need this conditional.

+#include "base/win/win_util.h"
+#endif
+
 namespace {
 
 const char kParentHandle[] = "parent-handle";
@@ -170,12 +174,12 @@ class ChromeWatcherClientThread : public base::SimpleThread {
     base::CommandLine ret = base::GetMultiProcessTestChildBaseCommandLine();
     ret.AppendSwitchASCII(switches::kTestChildProcess,
                           "ChromeWatcherClientTestProcess");
-    ret.AppendSwitchASCII(kEventHandle,
-                          base::UintToString(reinterpret_cast<unsigned int>(
-                              on_initialized_event)));
+    ret.AppendSwitchASCII(
+        kEventHandle,
+        base::UintToString(base::win::HandleToUint32(on_initialized_event)));
     ret.AppendSwitchASCII(
         kParentHandle,
-        base::UintToString(reinterpret_cast<unsigned int>(parent_handle)));
+        base::UintToString(base::win::HandleToUint32(parent_handle)));
 
     // Our child does not actually need the main thread ID, but we verify here
     // that the correct ID is being passed from the client.