diff options
| author | mcasas@chromium.org <mcasas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-09 15:27:34 +0000 |
|---|---|---|
| committer | mcasas@chromium.org <mcasas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-09 15:27:34 +0000 |
| commit | 7629a77a64629178432fe9f6a0903a2dab3cc641 (patch) | |
| tree | ad1ea906f325604c9ff20a1d67c42b6d343723b8 /content/test/content_test_launcher.cc | |
| parent | 789822be0cb55567d4bfcc3c44d9eb33ca0ed660 (diff) | |
| download | chromium_src-7629a77a64629178432fe9f6a0903a2dab3cc641.zip chromium_src-7629a77a64629178432fe9f6a0903a2dab3cc641.tar.gz chromium_src-7629a77a64629178432fe9f6a0903a2dab3cc641.tar.bz2 | |
Revert of Mac Video Capture Device: split VCD into VCD and Factory. (https://codereview.chromium.org/265263004/)
Reason for revert:
Some backoffice bots broke due to |kUseFakeDeviceForMediaStream| not being correctly defined - reverting until M36 storm passes and then I'll figure those out.
Original issue's description:
> 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.
>
> BUG=288562, 323913, 255552
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=269271
TBR=perkj@chromium.org,jochen@chromium.org,dalecurtis@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=288562, 323913, 255552
Review URL: https://codereview.chromium.org/273063002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269312 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, 0 insertions, 1 deletions
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc index 64e91f8..d351e91 100644 --- a/content/test/content_test_launcher.cc +++ b/content/test/content_test_launcher.cc @@ -17,7 +17,6 @@ #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) |