Replacing most of web_task.h with base::Closure + base::WeakPtrFactory.

components/test_runner/web_view_test_client.cc

 // Copyright 2016 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 "components/test_runner/web_view_test_client.h"
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "components/test_runner/event_sender.h"
 #include "components/test_runner/mock_web_speech_recognizer.h"
 #include "components/test_runner/test_common.h"
 #include "components/test_runner/test_runner.h"
 #include "components/test_runner/web_task.h"
 #include "components/test_runner/web_test_delegate.h"
 #include "components/test_runner/web_test_proxy.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebPagePopup.h"
 #include "third_party/WebKit/public/web/WebPrintParams.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "third_party/WebKit/public/web/WebWidget.h"
 
 namespace test_runner {
 
-namespace {
-
-class HostMethodTask : public WebMethodTask<WebViewTestClient> {
- public:
-  typedef void (WebViewTestClient::*CallbackMethodType)();
-  HostMethodTask(WebViewTestClient* object, CallbackMethodType callback)
-      : WebMethodTask<WebViewTestClient>(object), callback_(callback) {}
-
-  void RunIfValid() override { (object_->*callback_)(); }
-
- private:
-  CallbackMethodType callback_;
-};
-
-}  // namespace
-
 WebViewTestClient::WebViewTestClient(TestRunner* test_runner,
                                      WebTestDelegate* delegate,
                                      EventSender* event_sender,
                                      WebTestProxyBase* web_test_proxy_base)
     : test_runner_(test_runner),
       delegate_(delegate),
       event_sender_(event_sender),
       web_test_proxy_base_(web_test_proxy_base),
-      animation_scheduled_(false) {
+      animation_scheduled_(false),
+      weak_factory_(this) {
   DCHECK(test_runner);
   DCHECK(delegate);
   DCHECK(event_sender);
   DCHECK(web_test_proxy_base);
 }
 
 WebViewTestClient::~WebViewTestClient() {}
 
 void WebViewTestClient::scheduleAnimation() {
   if (!test_runner_->TestIsRunning())
     return;
 
   if (!animation_scheduled_) {
     animation_scheduled_ = true;
     test_runner_->OnAnimationScheduled(web_test_proxy_base_->web_view());
 
     delegate_->PostDelayedTask(
-        new HostMethodTask(this, &WebViewTestClient::AnimateNow), 1);
+        new WebCallbackTask(base::Bind(&WebViewTestClient::AnimateNow,
+                                       weak_factory_.GetWeakPtr())),
+        1);
   }
 }
 
 void WebViewTestClient::AnimateNow() {
   if (animation_scheduled_) {
     blink::WebWidget* web_widget = web_test_proxy_base_->web_widget();
     animation_scheduled_ = false;
     test_runner_->OnAnimationBegun(web_test_proxy_base_->web_view());
 
     base::TimeDelta animate_time = base::TimeTicks::Now() - base::TimeTicks();
@@ skipping 140 matching lines @@
   // to cancel the input method's ongoing composition session.
   if (web_test_proxy_base_)
     web_test_proxy_base_->web_widget()->confirmComposition();
 }
 
 blink::WebString WebViewTestClient::acceptLanguages() {
   return blink::WebString::fromUTF8(test_runner_->GetAcceptLanguages());
 }
 
 }  // namespace test_runner