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

components/test_runner/mock_webrtc_dtmf_sender_handler.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/mock_webrtc_dtmf_sender_handler.h"
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/logging.h"
+#include "components/test_runner/web_task.h"
 #include "components/test_runner/web_test_delegate.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
 #include "third_party/WebKit/public/platform/WebRTCDTMFSenderHandlerClient.h"
 
 using namespace blink;
 
 namespace test_runner {
 
-class DTMFSenderToneTask : public WebMethodTask<MockWebRTCDTMFSenderHandler> {
- public:
-  DTMFSenderToneTask(MockWebRTCDTMFSenderHandler* object,
-                     WebRTCDTMFSenderHandlerClient* client)
-      : WebMethodTask<MockWebRTCDTMFSenderHandler>(object), client_(client) {}
-
-  void RunIfValid() override {
-    WebString tones = object_->currentToneBuffer();
-    object_->ClearToneBuffer();
-    client_->didPlayTone(tones);
-  }
-
- private:
-  WebRTCDTMFSenderHandlerClient* client_;
-};
-
-/////////////////////
-
 MockWebRTCDTMFSenderHandler::MockWebRTCDTMFSenderHandler(
     const WebMediaStreamTrack& track,
     WebTestDelegate* delegate)
-    : client_(0), track_(track), delegate_(delegate) {
-}
+    : client_(0), track_(track), delegate_(delegate), weak_factory_(this) {}
+
+MockWebRTCDTMFSenderHandler::~MockWebRTCDTMFSenderHandler() {}
 
 void MockWebRTCDTMFSenderHandler::setClient(
     WebRTCDTMFSenderHandlerClient* client) {
   client_ = client;
 }
 
 WebString MockWebRTCDTMFSenderHandler::currentToneBuffer() {
   return tone_buffer_;
 }
 
 bool MockWebRTCDTMFSenderHandler::canInsertDTMF() {
   DCHECK(client_ && !track_.isNull());
   return track_.source().getType() == WebMediaStreamSource::TypeAudio &&
          track_.isEnabled() &&
          track_.source().getReadyState() ==
              WebMediaStreamSource::ReadyStateLive;
 }
 
 bool MockWebRTCDTMFSenderHandler::insertDTMF(const WebString& tones,
                                              long duration,
                                              long inter_tone_gap) {
   DCHECK(client_);
   if (!canInsertDTMF())
     return false;
 
   tone_buffer_ = tones;
-  delegate_->PostTask(new DTMFSenderToneTask(this, client_));
-  delegate_->PostTask(new DTMFSenderToneTask(this, client_));
+  base::Closure closure = base::Bind(&MockWebRTCDTMFSenderHandler::PlayTone,
+                                     weak_factory_.GetWeakPtr());
+  delegate_->PostTask(new WebCallbackTask(closure));
+  delegate_->PostTask(new WebCallbackTask(closure));
   return true;
 }
 
+void MockWebRTCDTMFSenderHandler::PlayTone() {
+  WebString tones = currentToneBuffer();
+  ClearToneBuffer();
+  client_->didPlayTone(tones);
+}
+
 }  // namespace test_runner