base::Bind: Conversions in webkit/plugins/npapi.

webkit/plugins/npapi/plugin_instance.cc

 // Copyright (c) 2011 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/plugin_instance.h"
 
+#include "base/bind.h"
 #include "build/build_config.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/npapi/plugin_host.h"
 #include "webkit/plugins/npapi/plugin_lib.h"
 #include "webkit/plugins/npapi/plugin_stream_url.h"
 #include "webkit/plugins/npapi/plugin_string_stream.h"
@@ skipping 407 matching lines @@
   DCHECK(load_manually_);
   if (plugin_data_stream_.get() != NULL) {
     plugin_data_stream_->DidFail();
     plugin_data_stream_ = NULL;
   }
 }
 
 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 *),
                                              void *user_data) {
   // Do not invoke the callback if NPP_Destroy has already been invoked.
   if (webplugin_)
     func(user_data);
 }
 
 uint32 PluginInstance::ScheduleTimer(uint32 interval,
                                      NPBool repeat,
                                      void (*func)(NPP id, uint32 timer_id)) {
   // Use next timer id.
   uint32 timer_id;
   timer_id = next_timer_id_;
   ++next_timer_id_;
   DCHECK(next_timer_id_ != 0);
 
   // Record timer interval and repeat.
   TimerInfo info;
   info.interval = interval;
   info.repeat = repeat ? true : false;
   timers_[timer_id] = info;
 
   // 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;
 }
 
 void PluginInstance::UnscheduleTimer(uint32 timer_id) {
   // Remove info about the timer.
   TimerMap::iterator it = timers_.find(timer_id);
   if (it != timers_.end())
     timers_.erase(it);
 }
@@ skipping 17 matching lines @@
   // callback might unschedule the timer.
   TimerInfo info = it->second;
 
   func(id, timer_id);
 
   // If the timer was unscheduled by the callback, just free up the timer id.
   if (timers_.find(timer_id) == timers_.end())
     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);
   }
 }
 
 void PluginInstance::PushPopupsEnabledState(bool enabled) {
   popups_enabled_stack_.push(enabled);
 }
 
@@ skipping 160 matching lines @@
         plugin_stream->UpdateUrl(
             plugin_stream->pending_redirect_url().c_str());
       }
       break;
     }
   }
 }
 
 }  // namespace npapi
 }  // namespace webkit