Fixing remaining VC++ 2015 64-bit build breaks

chrome/browser/hang_monitor/hung_plugin_action.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 <windows.h>
 
 #include "chrome/browser/hang_monitor/hung_plugin_action.h"
 
 #include "base/metrics/histogram.h"
 #include "base/version.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/common/webplugininfo.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/win/hwnd_util.h"
 

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

The OS_WIN ifdef is not needed. This file is windows specific

+#if defined(OS_WIN)
+#include "base/win/win_util.h"
+#endif
+
 namespace {
 
 const wchar_t kGTalkPluginName[] = L"Google Talk Plugin";
 const int kGTalkPluginLogMinVersion = 26;  // For version 2.6 and below.
 
 enum GTalkPluginLogVersion {
   GTALK_PLUGIN_VERSION_MIN = 0,
   GTALK_PLUGIN_VERSION_27,
   GTALK_PLUGIN_VERSION_28,
   GTALK_PLUGIN_VERSION_29,
@@ skipping 87 matching lines @@
               NULL, title, message, chrome::MESSAGE_BOX_TYPE_QUESTION) ==
           chrome::MESSAGE_BOX_RESULT_YES) {
         *action = HungWindowNotification::HUNG_WINDOW_TERMINATE_PROCESS;
       } else {
         // If the user choses to ignore the hung window warning, the
         // message timeout for this window should be doubled. We only
         // double the timeout property on the window if the property
         // exists. The property is deleted if the window becomes
         // responsive.
         continue_hang_detection = false;
-#pragma warning(disable:4311)
-        int child_window_message_timeout =
-            reinterpret_cast<int>(GetProp(
-                hung_window, HungWindowDetector::kHungChildWindowTimeout));
-#pragma warning(default:4311)
+        int child_window_message_timeout = base::win::HandleToUint32(
+            GetProp(hung_window, HungWindowDetector::kHungChildWindowTimeout));
         if (child_window_message_timeout) {
           child_window_message_timeout *= 2;
 #pragma warning(disable:4312)
           SetProp(hung_window, HungWindowDetector::kHungChildWindowTimeout,
                   reinterpret_cast<HANDLE>(child_window_message_timeout));
 #pragma warning(default:4312)
         }
       }
       current_hung_plugin_window_ = NULL;
     }
@@ skipping 34 matching lines @@
 void CALLBACK HungPluginAction::HungWindowResponseCallback(HWND target_window,
                                                            UINT message,
                                                            ULONG_PTR data,
                                                            LRESULT result) {
   HungPluginAction* instance = reinterpret_cast<HungPluginAction*>(data);
   DCHECK(NULL != instance);
   if (NULL != instance) {
     instance->OnWindowResponsive(target_window);
   }
 }