Index: webkit/support/webkit_support.cc |
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc |
index e83a935163bd3eacd70d4ddee985d9c6dfde0116..c448f596432f7144570d3ccf81d3b1c02edd1054 100644 |
--- a/webkit/support/webkit_support.cc |
+++ b/webkit/support/webkit_support.cc |
@@ -6,6 +6,8 @@ |
#include "base/at_exit.h" |
#include "base/base64.h" |
+#include "base/bind.h" |
+#include "base/bind_helpers.h" |
#include "base/command_line.h" |
#include "base/debug/debugger.h" |
#include "base/file_path.h" |
@@ -207,26 +209,6 @@ class WebKitClientMessageLoopImpl |
MessageLoop* message_loop_; |
}; |
-// An wrapper object for giving TaskAdaptor ref-countability, |
-// which NewRunnableMethod() requires. |
-class TaskAdaptorHolder : public CancelableTask { |
- public: |
- explicit TaskAdaptorHolder(webkit_support::TaskAdaptor* adaptor) |
- : adaptor_(adaptor) { |
- } |
- |
- virtual void Run() { |
- adaptor_->Run(); |
- } |
- |
- virtual void Cancel() { |
- adaptor_.reset(); |
- } |
- |
- private: |
- scoped_ptr<webkit_support::TaskAdaptor> adaptor_; |
-}; |
- |
webkit_support::GraphicsContext3DImplementation |
g_graphics_context_3d_implementation = |
webkit_support::IN_PROCESS_COMMAND_BUFFER; |
@@ -428,12 +410,12 @@ WebDevToolsAgentClient::WebKitClientMessageLoop* CreateDevToolsMessageLoop() { |
void PostDelayedTask(void (*func)(void*), void* context, int64 delay_ms) { |
MessageLoop::current()->PostDelayedTask( |
- FROM_HERE, NewRunnableFunction(func, context), delay_ms); |
+ FROM_HERE, base::Bind(func, context), delay_ms); |
} |
void PostDelayedTask(TaskAdaptor* task, int64 delay_ms) { |
MessageLoop::current()->PostDelayedTask( |
- FROM_HERE, new TaskAdaptorHolder(task), delay_ms); |
+ FROM_HERE, base::Bind(&TaskAdaptor::Run, base::Owned(task)), delay_ms); |
} |
// Wrappers for FilePath and file_util |