summaryrefslogtreecommitdiffstats
path: root/content/browser/speech/speech_recognizer_unittest.cc
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-08 18:58:51 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-08 18:58:51 +0000
commitd3c8aa84c5bf94c58b88b35d169694837cb454e5 (patch)
tree658c8300583e4adb5148c0d093677bf14690e28c /content/browser/speech/speech_recognizer_unittest.cc
parent4fbd79f46b1e5c580238c3cf0a8532144019e7d0 (diff)
downloadchromium_src-d3c8aa84c5bf94c58b88b35d169694837cb454e5.zip
chromium_src-d3c8aa84c5bf94c58b88b35d169694837cb454e5.tar.gz
chromium_src-d3c8aa84c5bf94c58b88b35d169694837cb454e5.tar.bz2
Revert r95841 due to failing media_unittests on linux_shared bot.
TBR=fischman@chromium.org Review URL: http://codereview.chromium.org/7601002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95846 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/speech/speech_recognizer_unittest.cc')
-rw-r--r--content/browser/speech/speech_recognizer_unittest.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/content/browser/speech/speech_recognizer_unittest.cc b/content/browser/speech/speech_recognizer_unittest.cc
index 76133b3d..d70df62 100644
--- a/content/browser/speech/speech_recognizer_unittest.cc
+++ b/content/browser/speech/speech_recognizer_unittest.cc
@@ -75,12 +75,11 @@ class SpeechRecognizerTest : public SpeechRecognizerDelegate,
// testing::Test methods.
virtual void SetUp() {
- AudioInputController::set_factory_for_testing(
- &audio_input_controller_factory_);
+ AudioInputController::set_factory(&audio_input_controller_factory_);
}
virtual void TearDown() {
- AudioInputController::set_factory_for_testing(NULL);
+ AudioInputController::set_factory(NULL);
}
void FillPacketWithTestWaveform() {