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

Unified Diff: content/shell/renderer/test_runner/WebTestProxy.cpp

Issue 268723002: Remove MockWebSpeechInputController (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
« no previous file with comments | « content/shell/renderer/test_runner/WebTestProxy.h ('k') | content/shell/renderer/test_runner/test_runner.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/renderer/test_runner/WebTestProxy.cpp
diff --git a/content/shell/renderer/test_runner/WebTestProxy.cpp b/content/shell/renderer/test_runner/WebTestProxy.cpp
index 7cc74a4ebfffafe65f856f014d1cb2b74380cac4..b4220dd68ee1d587615b7edf7f0aef0936772cdc 100644
--- a/content/shell/renderer/test_runner/WebTestProxy.cpp
+++ b/content/shell/renderer/test_runner/WebTestProxy.cpp
@@ -9,7 +9,6 @@
#include "base/logging.h"
#include "content/shell/renderer/test_runner/event_sender.h"
#include "content/shell/renderer/test_runner/MockColorChooser.h"
-#include "content/shell/renderer/test_runner/MockWebSpeechInputController.h"
#include "content/shell/renderer/test_runner/MockWebSpeechRecognizer.h"
#include "content/shell/renderer/test_runner/SpellCheckClient.h"
#include "content/shell/renderer/test_runner/TestCommon.h"
@@ -340,10 +339,6 @@ void WebTestProxyBase::setDelegate(WebTestDelegate* delegate)
{
m_delegate = delegate;
m_spellcheck->setDelegate(delegate);
-#if ENABLE_INPUT_SPEECH
- if (m_speechInputController.get())
- m_speechInputController->setDelegate(delegate);
-#endif
if (m_speechRecognizer.get())
m_speechRecognizer->setDelegate(delegate);
}
@@ -381,10 +376,6 @@ void WebTestProxyBase::reset()
m_logConsoleOutput = true;
if (m_midiClient.get())
m_midiClient->resetMock();
-#if ENABLE_INPUT_SPEECH
- if (m_speechInputController.get())
- m_speechInputController->clearResults();
-#endif
}
WebSpellCheckClient* WebTestProxyBase::spellCheckClient() const
@@ -605,14 +596,6 @@ WebMIDIClientMock* WebTestProxyBase::midiClientMock()
return m_midiClient.get();
}
-#if ENABLE_INPUT_SPEECH
-MockWebSpeechInputController* WebTestProxyBase::speechInputControllerMock()
-{
- DCHECK(m_speechInputController.get());
- return m_speechInputController.get();
-}
-#endif
-
MockWebSpeechRecognizer* WebTestProxyBase::speechRecognizerMock()
{
if (!m_speechRecognizer.get()) {
@@ -900,20 +883,6 @@ WebMIDIClient* WebTestProxyBase::webMIDIClient()
return midiClientMock();
}
-WebSpeechInputController* WebTestProxyBase::speechInputController(WebSpeechInputListener* listener)
-{
-#if ENABLE_INPUT_SPEECH
- if (!m_speechInputController.get()) {
- m_speechInputController.reset(new MockWebSpeechInputController(listener));
- m_speechInputController->setDelegate(m_delegate);
- }
- return m_speechInputController.get();
-#else
- DCHECK(listener);
- return 0;
-#endif
-}
-
WebSpeechRecognizer* WebTestProxyBase::speechRecognizer()
{
return speechRecognizerMock();
« no previous file with comments | « content/shell/renderer/test_runner/WebTestProxy.h ('k') | content/shell/renderer/test_runner/test_runner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698