Simplify mock web speech recognizer's "onend" handling.

components/test_runner/mock_web_speech_recognizer.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_web_speech_recognizer.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 93 matching lines @@
  private:
   blink::WebSpeechRecognizerClient::ErrorCode code_;
   blink::WebString message_;
 
   DISALLOW_COPY_AND_ASSIGN(ErrorTask);
 };
 
 // Task for tidying up after recognition task has ended.
 class EndedTask : public MockWebSpeechRecognizer::Task {
  public:
-  EndedTask(MockWebSpeechRecognizer* mock,
-            blink::WebSpeechRecognitionHandle handle)
-      : MockWebSpeechRecognizer::Task(mock), handle_(handle) {}
+  EndedTask(MockWebSpeechRecognizer* mock)
+      : MockWebSpeechRecognizer::Task(mock) {}
 
   ~EndedTask() override {}
 
   void run() override {
-    // Reset recognizer's handle if it hasn't been replaced.
-    if (recognizer_->Handle() == handle_)
-      recognizer_->Handle().reset();
-    handle_.reset();
+    blink::WebSpeechRecognitionHandle handle = recognizer_->Handle();
+    recognizer_->Handle().reset();
+    recognizer_->Client()->didEnd(handle);
   }
 
  private:
-  blink::WebSpeechRecognitionHandle handle_;
-
   DISALLOW_COPY_AND_ASSIGN(EndedTask);
 };
 
 }  // namespace
 
 MockWebSpeechRecognizer::MockWebSpeechRecognizer()
     : was_aborted_(false), task_queue_running_(false), delegate_(0) {
 }
 
 MockWebSpeechRecognizer::~MockWebSpeechRecognizer() {
@@ skipping 28 matching lines @@
 
     mock_transcripts_.clear();
     mock_confidences_.clear();
   } else
     task_queue_.push_back(new NoMatchTask(this));
 
   task_queue_.push_back(
       new ClientCallTask(this, &blink::WebSpeechRecognizerClient::didEndSound));
   task_queue_.push_back(
       new ClientCallTask(this, &blink::WebSpeechRecognizerClient::didEndAudio));
-  task_queue_.push_back(
-      new ClientCallTask(this, &blink::WebSpeechRecognizerClient::didEnd));
-  task_queue_.push_back(new EndedTask(this, handle_));
+  task_queue_.push_back(new EndedTask(this));
 
   StartTaskQueue();
 }
 
 void MockWebSpeechRecognizer::stop(
     const blink::WebSpeechRecognitionHandle& handle,
     blink::WebSpeechRecognizerClient* client) {
   handle_ = handle;
   client_ = client;
 
   // FIXME: Implement.
   NOTREACHED();
 }
 
 void MockWebSpeechRecognizer::abort(
     const blink::WebSpeechRecognitionHandle& handle,
     blink::WebSpeechRecognizerClient* client) {
   handle_ = handle;
   client_ = client;
 
   ClearTaskQueue();
   was_aborted_ = true;
-  task_queue_.push_back(
-      new ClientCallTask(this, &blink::WebSpeechRecognizerClient::didEnd));
-  task_queue_.push_back(new EndedTask(this, handle_));
+  task_queue_.push_back(new EndedTask(this));
 
   StartTaskQueue();
 }
 
 void MockWebSpeechRecognizer::AddMockResult(const blink::WebString& transcript,
                                             float confidence) {
   mock_transcripts_.push_back(transcript);
   mock_confidences_.push_back(confidence);
 }
 
@@ skipping 16 matching lines @@
     code = blink::WebSpeechRecognizerClient::ServiceNotAllowedError;
   else if (error == "BadGrammarError")
     code = blink::WebSpeechRecognizerClient::BadGrammarError;
   else if (error == "LanguageNotSupportedError")
     code = blink::WebSpeechRecognizerClient::LanguageNotSupportedError;
   else
     return;
 
   ClearTaskQueue();
   task_queue_.push_back(new ErrorTask(this, code, message));
-  task_queue_.push_back(
-      new ClientCallTask(this, &blink::WebSpeechRecognizerClient::didEnd));
-  task_queue_.push_back(new EndedTask(this, handle_));
+  task_queue_.push_back(new EndedTask(this));
 
   StartTaskQueue();
 }
 
 void MockWebSpeechRecognizer::StartTaskQueue() {
   if (task_queue_running_)
     return;
   delegate_->PostTask(new StepTask(this));
   task_queue_running_ = true;
 }
@@ skipping 19 matching lines @@
 
   if (object_->task_queue_.empty()) {
     object_->task_queue_running_ = false;
     return;
   }
 
   object_->delegate_->PostTask(new StepTask(object_));
 }
 
 }  // namespace test_runner