Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(132)

Unified Diff: components/test_runner/mock_web_speech_recognizer.h

Issue 1852603002: Replacing most of web_task.h with base::Closure + base::WeakPtrFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move-mocks-to-test-runner
Patch Set: Rebasing... Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/test_runner/mock_web_speech_recognizer.h
diff --git a/components/test_runner/mock_web_speech_recognizer.h b/components/test_runner/mock_web_speech_recognizer.h
index b3950de4050fa6de87293b0a2445c575f0d8b57a..e80897af39c1b186479c02941c1d25e7d1e94e3c 100644
--- a/components/test_runner/mock_web_speech_recognizer.h
+++ b/components/test_runner/mock_web_speech_recognizer.h
@@ -9,7 +9,7 @@
#include <vector>
#include "base/macros.h"
-#include "components/test_runner/web_task.h"
+#include "base/memory/weak_ptr.h"
#include "third_party/WebKit/public/web/WebSpeechRecognizer.h"
namespace blink {
@@ -47,7 +47,6 @@ class MockWebSpeechRecognizer : public blink::WebSpeechRecognizer {
// Methods accessed from Task objects:
blink::WebSpeechRecognizerClient* Client() { return client_; }
blink::WebSpeechRecognitionHandle& Handle() { return handle_; }
- WebTaskList* mutable_task_list() { return &task_list_; }
class Task {
public:
@@ -65,8 +64,9 @@ class MockWebSpeechRecognizer : public blink::WebSpeechRecognizer {
private:
void StartTaskQueue();
void ClearTaskQueue();
+ void PostRunTaskFromQueue();
+ void RunTaskFromQueue();
- WebTaskList task_list_;
blink::WebSpeechRecognitionHandle handle_;
blink::WebSpeechRecognizerClient* client_;
std::vector<blink::WebString> mock_transcripts_;
@@ -79,16 +79,7 @@ class MockWebSpeechRecognizer : public blink::WebSpeechRecognizer {
WebTestDelegate* delegate_;
- // Task for stepping the queue.
- class StepTask : public WebMethodTask<MockWebSpeechRecognizer> {
- public:
- StepTask(MockWebSpeechRecognizer* object)
- : WebMethodTask<MockWebSpeechRecognizer>(object) {}
- void RunIfValid() override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(StepTask);
- };
+ base::WeakPtrFactory<MockWebSpeechRecognizer> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(MockWebSpeechRecognizer);
};
« no previous file with comments | « components/test_runner/mock_web_midi_accessor.cc ('k') | components/test_runner/mock_web_speech_recognizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698