Fixing remaining VC++ 2015 64-bit build breaks

chrome/browser/hang_monitor/hung_window_detector.cc

 // Copyright (c) 2012 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/browser/hang_monitor/hung_window_detector.h"
 
 #include <windows.h>
 #include <atlbase.h>
 
 #include "base/logging.h"
 #include "chrome/browser/hang_monitor/hang_crash_dump_win.h"
 #include "content/public/common/result_codes.h"
 
+#if defined(OS_WIN)
+#include "base/win/win_util.h"

[ananta, 2015/11/18 19:13:42]

Remove the OS_WIN ifdef.

+#endif
+
 const wchar_t HungWindowDetector::kHungChildWindowTimeout[] =
     L"Chrome_HungChildWindowTimeout";
 
 HungWindowDetector::HungWindowDetector(HungWindowNotification* notification)
     : notification_(notification),
       top_level_window_(NULL),
       message_response_timeout_(0),
       enumerating_(false) {
   DCHECK(NULL != notification_);
 }
@@ skipping 57 matching lines @@
 
   DWORD child_window_process_id = 0;
   DWORD child_window_thread_id =
       GetWindowThreadProcessId(child_window, &child_window_process_id);
   bool continue_hang_detection = true;
 
   if (top_level_window_thread_id != child_window_thread_id) {
     // The message timeout for a child window starts of with a default
     // value specified by the message_response_timeout_ member. It is
     // tracked by a property on the child window.
-#pragma warning(disable:4311)
-    int child_window_message_timeout =
-        reinterpret_cast<int>(GetProp(child_window, kHungChildWindowTimeout));
-#pragma warning(default:4311)
+    int child_window_message_timeout = base::win::HandleToUint32(
+        GetProp(child_window, kHungChildWindowTimeout));
     if (!child_window_message_timeout) {
       child_window_message_timeout = message_response_timeout_;
     }
 
     DWORD_PTR result = 0;
     if (0 == SendMessageTimeout(child_window,
                                 WM_NULL,
                                 0,
                                 0,
                                 SMTO_BLOCK,
@@ skipping 47 matching lines @@
                                                    LPARAM param) {
   HungWindowDetector* detector_instance =
       reinterpret_cast<HungWindowDetector*>(param);
   if (NULL == detector_instance) {
     NOTREACHED();
     return FALSE;
   }
 
   return detector_instance->CheckChildWindow(child_window);
 }