summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorjanx@chromium.org <janx@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-12 07:38:01 +0000
committerjanx@chromium.org <janx@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-12 07:38:01 +0000
commitcec5983338c93312e6a049ad31f028c25f7d6abc (patch)
tree07d512db3a6ca8a8debefae72ff4b68cc2156c9c /media
parent494a215ee29a52f46aa785dbe215a6425505e26c (diff)
downloadchromium_src-cec5983338c93312e6a049ad31f028c25f7d6abc.zip
chromium_src-cec5983338c93312e6a049ad31f028c25f7d6abc.tar.gz
chromium_src-cec5983338c93312e6a049ad31f028c25f7d6abc.tar.bz2
Add browser tests for the Web Speech Recognition API.
Introduce an event-driven timeline utility to verify if everything in test scenarii is happening on the right thread and in the right order, and add a simple precheck browser test that opens an HTML test page and verifies that creating a SpeechRecognition object works. BUG=301906 Review URL: https://codereview.chromium.org/23500011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228332 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/audio/test_audio_input_controller_factory.cc5
-rw-r--r--media/audio/test_audio_input_controller_factory.h8
2 files changed, 7 insertions, 6 deletions
diff --git a/media/audio/test_audio_input_controller_factory.cc b/media/audio/test_audio_input_controller_factory.cc
index d146231..3aeb777 100644
--- a/media/audio/test_audio_input_controller_factory.cc
+++ b/media/audio/test_audio_input_controller_factory.cc
@@ -57,11 +57,6 @@ AudioInputController* TestAudioInputControllerFactory::Create(
return controller_;
}
-void TestAudioInputControllerFactory::SetDelegateForTests(
- TestAudioInputControllerDelegate* delegate) {
- delegate_ = delegate;
-}
-
void TestAudioInputControllerFactory::OnTestAudioInputControllerDestroyed(
TestAudioInputController* controller) {
DCHECK_EQ(controller_, controller);
diff --git a/media/audio/test_audio_input_controller_factory.h b/media/audio/test_audio_input_controller_factory.h
index 4968c01..d493022 100644
--- a/media/audio/test_audio_input_controller_factory.h
+++ b/media/audio/test_audio_input_controller_factory.h
@@ -69,6 +69,10 @@ class TestAudioInputController : public AudioInputController {
// Ensure that the closure is run on the audio-manager thread.
virtual void Close(const base::Closure& closed_task) OVERRIDE;
+ const AudioParameters& audio_parameters() const {
+ return audio_parameters_;
+ }
+
protected:
virtual ~TestAudioInputController();
@@ -99,7 +103,9 @@ class TestAudioInputControllerFactory : public AudioInputController::Factory {
AudioParameters params,
UserInputMonitor* user_input_monitor) OVERRIDE;
- void SetDelegateForTests(TestAudioInputControllerDelegate* delegate);
+ void set_delegate(TestAudioInputControllerDelegate* delegate) {
+ delegate_ = delegate;
+ }
TestAudioInputController* controller() const { return controller_; }