Make npapi_test_plugin build on Win64

webkit/plugins/npapi/test/plugin_npobject_lifetime_test.cc

 // Copyright (c) 2010 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 "webkit/plugins/npapi/test/plugin_npobject_lifetime_test.h"
 
 namespace NPAPIClient {
 
 const int kNPObjectLifetimeTimer = 100;
 const int kNPObjectLifetimeTimerElapse = 2000;
@@ skipping 21 matching lines @@
     // We attempt to retreive the NPObject for the plugin instance identified
     // by the NPObjectLifetimeTestInstance2 class as it may not have been
     // instantiated yet.
     timer_id_ = SetTimer(window_handle, kNPObjectLifetimeTimer,
                          kNPObjectLifetimeTimerElapse, TimerProc);
   }
   return NPERR_NO_ERROR;
 }
 
 void CALLBACK NPObjectLifetimeTest::TimerProc(
-    HWND window, UINT message, UINT timer_id,
-    unsigned long elapsed_milli_seconds) {
+    HWND window, UINT message, UINT_PTR timer_id,
+    DWORD elapsed_milli_seconds) {
 
   NPObjectLifetimeTest* this_instance =
       reinterpret_cast<NPObjectLifetimeTest*>
           (::GetProp(window, L"Plugin_Instance"));
   KillTimer(window, this_instance->timer_id_);
   ::RemoveProp(window,  L"Plugin_Instance");
 
   this_instance->timer_id_ = 0;
 
   this_instance->other_plugin_instance_object_ =
@@ skipping 74 matching lines @@
     return NPERR_NO_ERROR;
 
   HWND window_handle = reinterpret_cast<HWND>(np_window->window);
   // We setup a timerproc to invoke NPN_Evaluate to destroy this plugin
   // instance. This is to ensure that we don't destroy the plugin instance
   // while it is being used in webkit as this leads to crashes and is a
   // more accurate representation of the renderer crash as described in
   // http://b/issue?id=1134683.
   if (!timer_id_) {
     timer_id_ = SetTimer(window_handle, kNPObjectLifetimeTimer,
-                        kNPObjectLifetimeTimerElapse, TimerProc);
+                         kNPObjectLifetimeTimerElapse, TimerProc);
   }
   return NPERR_NO_ERROR;
 }
 
 void CALLBACK NPObjectDeletePluginInNPN_Evaluate::TimerProc(
-    HWND window, UINT message, UINT timer_id,
-    unsigned long elapsed_milli_seconds) {
+    HWND window, UINT message, UINT_PTR timer_id,
+    DWORD elapsed_milli_seconds) {
 
   KillTimer(window, g_npn_evaluate_test_instance_->timer_id_);
   g_npn_evaluate_test_instance_->timer_id_ = 0;
   NPObject *window_obj = NULL;
   g_npn_evaluate_test_instance_->HostFunctions()->getvalue(
       g_npn_evaluate_test_instance_->id(), NPNVWindowNPObject,
       &window_obj);
 
   if (!window_obj) {
     g_npn_evaluate_test_instance_->SetError(
         "Failed to get NPObject for plugin instance2");
     g_npn_evaluate_test_instance_->SignalTestCompleted();
     return;
   }
 
   std::string script = "javascript:DeletePluginWithinScript()";
   NPString script_string;
   script_string.UTF8Characters = script.c_str();
   script_string.UTF8Length =
       static_cast<unsigned int>(script.length());
 
   NPVariant result_var;
   bool result = g_npn_evaluate_test_instance_->HostFunctions()->evaluate(
       g_npn_evaluate_test_instance_->id(), window_obj,
       &script_string, &result_var);
   // If this test failed we would have crashed by now.
 }
 
 } // namespace NPAPIClient