summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-31 09:26:56 +0000
committerhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-31 09:26:56 +0000
commit245567a5538cbc4586df58fb0a7bb8ca51ac0d24 (patch)
treeb4a6ef304faa5257707da5662627bdc6a1aa7049 /webkit/tools
parentcd2af395e8429a30bcee9e7ad7ec9f4b680c924d (diff)
downloadchromium_src-245567a5538cbc4586df58fb0a7bb8ca51ac0d24.zip
chromium_src-245567a5538cbc4586df58fb0a7bb8ca51ac0d24.tar.gz
chromium_src-245567a5538cbc4586df58fb0a7bb8ca51ac0d24.tar.bz2
Remove the use of WebSpeechInputControllerMock from test_shell.
It hasn't been used in test_shell since r74140, and now the class is being removed (see https://bugs.webkit.org/show_bug.cgi?id=77083) BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/9296043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119874 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/layout_test_controller.cc1
-rw-r--r--webkit/tools/test_shell/test_shell.cc17
-rw-r--r--webkit/tools/test_shell/test_shell.h8
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.cc7
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.h2
5 files changed, 1 insertions, 34 deletions
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc
index 9ec8eed..201c3c7 100644
--- a/webkit/tools/test_shell/layout_test_controller.cc
+++ b/webkit/tools/test_shell/layout_test_controller.cc
@@ -34,7 +34,6 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechInputControllerMock.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "webkit/glue/dom_operations.h"
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 311955e..0a79030 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -30,7 +30,6 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientationClientMock.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationClientMock.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechInputControllerMock.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h"
@@ -600,22 +599,6 @@ TestShell::device_orientation_client_mock() {
return device_orientation_client_mock_.get();
}
-WebKit::WebSpeechInputControllerMock*
-TestShell::CreateSpeechInputControllerMock(
- WebKit::WebSpeechInputListener* listener) {
- DCHECK(!speech_input_controller_mock_.get());
-#if defined(ENABLE_INPUT_SPEECH)
- speech_input_controller_mock_.reset(
- WebKit::WebSpeechInputControllerMock::create(listener));
-#endif
- return speech_input_controller_mock_.get();
-}
-
-WebKit::WebSpeechInputControllerMock*
-TestShell::speech_input_controller_mock() {
- return speech_input_controller_mock_.get();
-}
-
WebKit::WebGeolocationClientMock* TestShell::geolocation_client_mock() {
if (!geolocation_client_mock_.get()) {
geolocation_client_mock_.reset(
diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h
index 130bb29..fbe5541 100644
--- a/webkit/tools/test_shell/test_shell.h
+++ b/webkit/tools/test_shell/test_shell.h
@@ -61,8 +61,6 @@ class TestWebViewDelegate;
namespace WebKit {
class WebDeviceOrientationClientMock;
class WebGeolocationClientMock;
-class WebSpeechInputControllerMock;
-class WebSpeechInputListener;
}
class TestShell : public base::SupportsWeakPtr<TestShell> {
@@ -313,10 +311,6 @@ public:
WebKit::WebDeviceOrientationClientMock* device_orientation_client_mock();
- WebKit::WebSpeechInputControllerMock* CreateSpeechInputControllerMock(
- WebKit::WebSpeechInputListener* listener);
- WebKit::WebSpeechInputControllerMock* speech_input_controller_mock();
-
WebKit::WebGeolocationClientMock* geolocation_client_mock();
protected:
@@ -396,8 +390,6 @@ private:
scoped_ptr<TestShellDevToolsClient> dev_tools_client_;
scoped_ptr<WebKit::WebDeviceOrientationClientMock>
device_orientation_client_mock_;
- scoped_ptr<WebKit::WebSpeechInputControllerMock>
- speech_input_controller_mock_;
scoped_ptr<WebKit::WebGeolocationClientMock> geolocation_client_mock_;
const TestParams* test_params_;
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index b582a58e..91737f6 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -44,9 +44,6 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechInputController.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechInputControllerMock.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechInputListener.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
@@ -560,7 +557,7 @@ TestWebViewDelegate::deviceOrientationClient() {
WebKit::WebSpeechInputController* TestWebViewDelegate::speechInputController(
WebKit::WebSpeechInputListener* listener) {
- return shell_->CreateSpeechInputControllerMock(listener);
+ return 0;
}
// WebWidgetClient -----------------------------------------------------------
@@ -1000,8 +997,6 @@ void TestWebViewDelegate::Reset() {
TestShell* shell = shell_;
this->~TestWebViewDelegate();
new (this) TestWebViewDelegate(shell);
- if (shell->speech_input_controller_mock())
- shell->speech_input_controller_mock()->clearResults();
}
void TestWebViewDelegate::SetSmartInsertDeleteEnabled(bool enabled) {
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index a57b5ec..7bd34df 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -52,8 +52,6 @@ class WebWidgetHost;
namespace WebKit {
class WebDeviceOrientationClient;
-class WebSpeechInputController;
-class WebSpeechInputListener;
class WebStorageNamespace;
struct WebWindowFeatures;
}