base::Bind() conversion for webkit.

webkit/support/webkit_support.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/support/webkit_support.h"
 
 #include "base/at_exit.h"
 #include "base/base64.h"
+#include "base/bind.h"

[csilv, 2011/11/21 21:26:31]

add #include base/bind_helpers.h

[dcheng, 2011/11/21 22:04:16]

Done.

 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/i18n/icu_util.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ skipping 181 matching lines @@
     message_loop_->Run();
     message_loop_->SetNestableTasksAllowed(old_state);
   }
   virtual void quitNow() {
     message_loop_->QuitNow();
   }
  private:
   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;
 
 }  // namespace
 
 namespace webkit_support {
 
 static TestEnvironment* test_environment;
 
@@ skipping 181 matching lines @@
   current->RunAllPending();
   current->SetNestableTasksAllowed(old_state);
 }
 
 WebDevToolsAgentClient::WebKitClientMessageLoop* CreateDevToolsMessageLoop() {
   return new WebKitClientMessageLoopImpl();
 }
 
 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
 
 WebString GetAbsoluteWebStringFromUTF8Path(const std::string& utf8_path) {
 #if defined(OS_WIN)
   FilePath path(UTF8ToWide(utf8_path));
   file_util::AbsolutePath(&path);
   return WebString(path.value());
 #else
@@ skipping 193 matching lines @@
 double GetForegroundTabTimerInterval() {
   return webkit_glue::kForegroundTabTimerInterval;
 }
 
 // Logging
 void EnableWebCoreLogChannels(const std::string& channels) {
   webkit_glue::EnableWebCoreLogChannels(channels);
 }
 
 }  // namespace webkit_support