diff options
| author | mcasas@chromium.org <mcasas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-14 12:20:25 +0000 |
|---|---|---|
| committer | mcasas@chromium.org <mcasas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-14 12:20:25 +0000 |
| commit | 8a3d2deef500a5e9862b689f6638796b69185b6a (patch) | |
| tree | fef35ec7a3c2ed2b81975840624b0506cdfec96a /content/test/content_test_launcher.cc | |
| parent | 59d41dffe8c37b1f051dc31a6f2ab61dabce1313 (diff) | |
| download | chromium_src-8a3d2deef500a5e9862b689f6638796b69185b6a.zip chromium_src-8a3d2deef500a5e9862b689f6638796b69185b6a.tar.gz chromium_src-8a3d2deef500a5e9862b689f6638796b69185b6a.tar.bz2 | |
Reland: Mac Video Capture Device: split VCD into VCD and Factory.
Reland of the mentioned CL, that hit an internal bot due
to a test needing the flag |kUseFakeDeviceForMediaStream|.
Original CL message -----------------------------------------------
Mac Video Capture Device: split VCD into VCD and Factory.
VideoCaptureDeviceMac includes factory and non-factory parts.
This CL splits them into VideoCaptureDeviceMac and
VideoCaptureDeviceFactoryMac. The latter inherits the previous
class' static methods: Create(), GetDeviceNames() and
GetDeviceSupportedFormats().
All video factory code previously in MediaStreamManager is
moved into VideoCaptureFactory. This includes the use
of the flag |kUseFakeDeviceForMediaStream|.
This flag is moved correspondingly into media_switches.cc --
(but note that this flag is still used in MediaStreamManager for
the Fake Audio parts). File media_switches.cc is
included in several test files where the flag is used.
VideoCaptureDeviceTest is splitted as well into:
a) Tests that were exercising only the FakeVCD
(FakeVideoCaptureDeviceTest).
b) All other tests, that use the underlying OS webcam.
This VideoCaptureDeviceTest gets a Factory and uses it
instead of static methods.
A unit test is added to VCDFMac, doing little for the moment
but I'm planning to add support for testing at least the
blacklisting -- req from rsesek@ in another CL.
-------------------------------------------------------------------
TBR= perkj@chromium.org, dalecurtis@chromium.org, jochen@chromium.org
BUG=288562, 323913, 255552
Review URL: https://codereview.chromium.org/278333002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270391 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/content_test_launcher.cc')
| -rw-r--r-- | content/test/content_test_launcher.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc index d351e91..64e91f8 100644 --- a/content/test/content_test_launcher.cc +++ b/content/test/content_test_launcher.cc @@ -17,6 +17,7 @@ #include "content/public/test/content_test_suite_base.h" #include "content/shell/app/shell_main_delegate.h" #include "content/shell/common/shell_switches.h" +#include "media/base/media_switches.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_ANDROID) |