diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-29 06:53:57 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-29 06:53:57 +0000 |
| commit | 3e21bd00219f2dd475f36cad70c7e8e5a6c90a4e (patch) | |
| tree | a666f584af965358e59dbb99d51f4e1ede810f61 /content/browser/speech | |
| parent | 80afbdbf6432bae199da3ef53dc02de7160585cc (diff) | |
| download | chromium_src-3e21bd00219f2dd475f36cad70c7e8e5a6c90a4e.zip chromium_src-3e21bd00219f2dd475f36cad70c7e8e5a6c90a4e.tar.gz chromium_src-3e21bd00219f2dd475f36cad70c7e8e5a6c90a4e.tar.bz2 | |
Create media.dll / libmedia.so.
This is a re-attempt at landing http://codereview.chromium.org/7572040, now with a DEPS roll to pick up the changes made to ffmpeg by http://codereview.chromium.org/7778004/ so that media_unittests run properly on Linux.
TBR=fischman
Review URL: http://codereview.chromium.org/7775004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/speech')
| -rw-r--r-- | content/browser/speech/speech_recognizer_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/speech/speech_recognizer_unittest.cc b/content/browser/speech/speech_recognizer_unittest.cc index d70df62..76133b3d 100644 --- a/content/browser/speech/speech_recognizer_unittest.cc +++ b/content/browser/speech/speech_recognizer_unittest.cc @@ -75,11 +75,12 @@ class SpeechRecognizerTest : public SpeechRecognizerDelegate, // testing::Test methods. virtual void SetUp() { - AudioInputController::set_factory(&audio_input_controller_factory_); + AudioInputController::set_factory_for_testing( + &audio_input_controller_factory_); } virtual void TearDown() { - AudioInputController::set_factory(NULL); + AudioInputController::set_factory_for_testing(NULL); } void FillPacketWithTestWaveform() { |