diff options
author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-26 10:54:01 +0000 |
---|---|---|
committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-26 10:54:01 +0000 |
commit | 7362421eb71391bd7078fe618f4baa4df5c57c99 (patch) | |
tree | 5e47f55280aa093ac7f957749d33d227b288c2d5 /content/test | |
parent | 507066ee0c76947e7fe62a839165870366a8da3c (diff) | |
download | chromium_src-7362421eb71391bd7078fe618f4baa4df5c57c99.zip chromium_src-7362421eb71391bd7078fe618f4baa4df5c57c99.tar.gz chromium_src-7362421eb71391bd7078fe618f4baa4df5c57c99.tar.bz2 |
Add a flag to use fake camera for getUserMedia()
Add a flag --use-fake-device-for-media-stream for replacing actual
camera with a fake one.
The fake camera also generates a visual beep every 1 second.
BUG=
Review URL: https://chromiumcodereview.appspot.com/11270026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164313 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test')
-rw-r--r-- | content/test/content_test_launcher.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc index 15b5a3f..6e8c4ae 100644 --- a/content/test/content_test_launcher.cc +++ b/content/test/content_test_launcher.cc @@ -9,7 +9,6 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/test/test_suite.h" -#include "content/browser/renderer_host/media/media_stream_manager.h" #include "content/public/common/content_switches.h" #include "content/public/test/content_test_suite_base.h" #include "content/shell/shell_content_browser_client.h" @@ -97,6 +96,7 @@ class ContentTestLauncherDelegate : public TestLauncherDelegate { CommandLine* command_line, const FilePath& temp_data_dir) OVERRIDE { command_line->AppendSwitchPath(switches::kContentShellDataPath, temp_data_dir); + command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream); return true; } @@ -112,10 +112,6 @@ class ContentTestLauncherDelegate : public TestLauncherDelegate { } // namespace content int main(int argc, char** argv) { - // Always use fake WebRTC devices in this binary since we want to be able - // to test WebRTC even if we don't have any devices on the system. - media_stream::MediaStreamManager::AlwaysUseFakeDevice(); - content::ContentTestLauncherDelegate launcher_delegate; return LaunchTests(&launcher_delegate, argc, argv); } |