summaryrefslogtreecommitdiffstats
path: root/media/audio/audio_input_controller.h
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-29 06:53:57 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-29 06:53:57 +0000
commit3e21bd00219f2dd475f36cad70c7e8e5a6c90a4e (patch)
treea666f584af965358e59dbb99d51f4e1ede810f61 /media/audio/audio_input_controller.h
parent80afbdbf6432bae199da3ef53dc02de7160585cc (diff)
downloadchromium_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 'media/audio/audio_input_controller.h')
-rw-r--r--media/audio/audio_input_controller.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/media/audio/audio_input_controller.h b/media/audio/audio_input_controller.h
index 164b09f..22f6ffe 100644
--- a/media/audio/audio_input_controller.h
+++ b/media/audio/audio_input_controller.h
@@ -35,7 +35,7 @@
//
namespace media {
-class AudioInputController
+class MEDIA_EXPORT AudioInputController
: public base::RefCountedThreadSafe<AudioInputController>,
public AudioInputStream::AudioInputCallback {
public:
@@ -99,10 +99,8 @@ class AudioInputController
// Sets the factory used by the static method Create. AudioInputController
// does not take ownership of |factory|. A value of NULL results in an
// AudioInputController being created directly.
-#if defined(UNIT_TEST)
- static void set_factory(Factory* factory) { factory_ = factory; }
- AudioInputStream* stream() { return stream_; }
-#endif
+ static void set_factory_for_testing(Factory* factory) { factory_ = factory; }
+ AudioInputStream* stream_for_testing() { return stream_; }
// Starts recording in this audio input stream.
virtual void Record();