Fixing remaining VC++ 2015 64-bit build breaks

chrome/app/chrome_watcher_client_unittest_win.cc

 // Copyright 2015 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 "chrome/app/chrome_watcher_client_win.h"
 
 #include <windows.h>
 #include <string>
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/process/process_handle.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/multiprocess_test.h"
 #include "base/threading/simple_thread.h"
 #include "base/time/time.h"
 #include "base/win/scoped_handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
 
+#if defined(OS_WIN)
+#include "base/win/win_util.h"
+#endif
+
 namespace {
 
 const char kParentHandle[] = "parent-handle";
 const char kEventHandle[] = "event-handle";
 const char kNamedEventSuffix[] = "named-event-suffix";
 
 const base::char16 kExitEventBaseName[] = L"ChromeWatcherClientTestExitEvent_";
 const base::char16 kInitializeEventBaseName[] =
     L"ChromeWatcherClientTestInitializeEvent_";
 
@@ skipping 127 matching lines @@
   }
 
  private:
   // Returns a command line to launch back into ChromeWatcherClientTestProcess.
   base::CommandLine GenerateCommandLine(HANDLE parent_handle,
                                         DWORD main_thread_id,
                                         HANDLE on_initialized_event) {
     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.
     EXPECT_EQ(::GetCurrentThreadId(), main_thread_id);
 
     ret.AppendSwitchASCII(kNamedEventSuffix,
                           base::UTF16ToASCII(NamedEventSuffix()));
     return ret;
   }
 
@@ skipping 78 matching lines @@
   // Give a broken implementation a chance to exit unexpectedly.
   ASSERT_FALSE(thread().WaitForResultWithTimeout(
       base::TimeDelta::FromMilliseconds(100), &result));
   ASSERT_TRUE(SignalExit());
   ASSERT_FALSE(thread().WaitForResult());
   int exit_code = 0;
   ASSERT_TRUE(
       thread().client().WaitForExitWithTimeout(base::TimeDelta(), &exit_code));
   ASSERT_EQ(0, exit_code);
 }