Index: webkit/plugins/npapi/plugin_instance.cc |
diff --git a/webkit/plugins/npapi/plugin_instance.cc b/webkit/plugins/npapi/plugin_instance.cc |
index 30e16a54e6d164dadd0af665f382bd9c1bfeb865..464e6b20963faa27d899335a4f9688c7d522492a 100644 |
--- a/webkit/plugins/npapi/plugin_instance.cc |
+++ b/webkit/plugins/npapi/plugin_instance.cc |
@@ -4,6 +4,7 @@ |
#include "webkit/plugins/npapi/plugin_instance.h" |
+#include "base/bind.h" |
#include "build/build_config.h" |
#include "base/file_util.h" |
#include "base/message_loop.h" |
@@ -431,8 +432,8 @@ void PluginInstance::DidManualLoadFail() { |
void PluginInstance::PluginThreadAsyncCall(void (*func)(void *), |
void *user_data) { |
message_loop_->PostTask( |
- FROM_HERE, NewRunnableMethod( |
- this, &PluginInstance::OnPluginThreadAsyncCall, func, user_data)); |
+ FROM_HERE, base::Bind(&PluginInstance::OnPluginThreadAsyncCall, this, |
+ func, user_data)); |
} |
void PluginInstance::OnPluginThreadAsyncCall(void (*func)(void *), |
@@ -460,8 +461,7 @@ uint32 PluginInstance::ScheduleTimer(uint32 interval, |
// Schedule the callback. |
MessageLoop::current()->PostDelayedTask( |
FROM_HERE, |
- NewRunnableMethod( |
- this, &PluginInstance::OnTimerCall, func, npp_, timer_id), |
+ base::Bind(&PluginInstance::OnTimerCall, this, func, npp_, timer_id), |
interval); |
return timer_id; |
} |
@@ -499,12 +499,11 @@ void PluginInstance::OnTimerCall(void (*func)(NPP id, uint32 timer_id), |
return; |
// Reschedule repeating timers after invoking the callback so callback is not |
- // re-entered if it pumps the messager loop. |
+ // re-entered if it pumps the message loop. |
if (info.repeat) { |
MessageLoop::current()->PostDelayedTask( |
FROM_HERE, |
- NewRunnableMethod( |
- this, &PluginInstance::OnTimerCall, func, npp_, timer_id), |
+ base::Bind(&PluginInstance::OnTimerCall, this, func, npp_, timer_id), |
info.interval); |
} else { |
timers_.erase(it); |