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

components/test_runner/spell_check_client.cc

 // Copyright 2014 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/spell_check_client.h"
 
 #include <stddef.h>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "components/test_runner/mock_grammar_check.h"
 #include "components/test_runner/test_runner.h"
+#include "components/test_runner/web_task.h"
 #include "components/test_runner/web_test_delegate.h"
 #include "third_party/WebKit/public/web/WebTextCheckingCompletion.h"
 #include "third_party/WebKit/public/web/WebTextCheckingResult.h"
 
 namespace test_runner {
 
-namespace {
-
-class HostMethodTask : public WebMethodTask<SpellCheckClient> {
- public:
-  typedef void (SpellCheckClient::*CallbackMethodType)();
-  HostMethodTask(SpellCheckClient* object, CallbackMethodType callback)
-      : WebMethodTask<SpellCheckClient>(object), callback_(callback) {}
-
-  ~HostMethodTask() override {}
-
-  void RunIfValid() override { (object_->*callback_)(); }
-
- private:
-  CallbackMethodType callback_;
-
-  DISALLOW_COPY_AND_ASSIGN(HostMethodTask);
-};
-
-}  // namespace
-
 SpellCheckClient::SpellCheckClient(TestRunner* test_runner)
     : last_requested_text_checking_completion_(nullptr),
-      test_runner_(test_runner) {
+      test_runner_(test_runner),
+      weak_factory_(this) {
   DCHECK(test_runner);
 }
 
 SpellCheckClient::~SpellCheckClient() {
 }
 
 void SpellCheckClient::SetDelegate(WebTestDelegate* delegate) {
   delegate_ = delegate;
 }
 
@@ skipping 48 matching lines @@
 
   if (last_requested_text_checking_completion_)
     last_requested_text_checking_completion_->didCancelCheckingText();
 
   last_requested_text_checking_completion_ = completion;
   last_requested_text_check_string_ = text;
   if (spell_check_.HasInCache(text))
     FinishLastTextCheck();
   else
     delegate_->PostDelayedTask(
-        new HostMethodTask(this, &SpellCheckClient::FinishLastTextCheck), 0);
+        new WebCallbackTask(base::Bind(&SpellCheckClient::FinishLastTextCheck,
+                                       weak_factory_.GetWeakPtr())),
+        0);
 }
 
 void SpellCheckClient::FinishLastTextCheck() {
   if (!last_requested_text_checking_completion_)
     return;
   std::vector<blink::WebTextCheckingResult> results;
   int offset = 0;
   base::string16 text = last_requested_text_check_string_;
   if (!spell_check_.IsMultiWordMisspelling(blink::WebString(text), &results)) {
     while (text.length()) {
@@ skipping 19 matching lines @@
                                            &results);
   }
   last_requested_text_checking_completion_->didFinishCheckingText(results);
   last_requested_text_checking_completion_ = 0;
 
   if (test_runner_->shouldDumpSpellCheckCallbacks())
     delegate_->PrintMessage("SpellCheckEvent: FinishLastTextCheck\n");
 }
 
 }  // namespace test_runner