summaryrefslogtreecommitdiffstats
path: root/media/base
diff options
context:
space:
mode:
authortomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-15 00:50:54 +0000
committertomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-15 00:50:54 +0000
commitb150b553cd0e97b649e94f11fd5c1d4b092327f2 (patch)
treef8b4b6b955eee04abb06438039d32c20837cef2f /media/base
parent3e001dce773fd9252e0ccffe11ef8fb43bdf1922 (diff)
downloadchromium_src-b150b553cd0e97b649e94f11fd5c1d4b092327f2.zip
chromium_src-b150b553cd0e97b649e94f11fd5c1d4b092327f2.tar.gz
chromium_src-b150b553cd0e97b649e94f11fd5c1d4b092327f2.tar.bz2
media: Remove VP9 flag, and enable VP9 support by default.
BUG=180280 TEST=VP9 pipeline integration tests pass Review URL: https://chromiumcodereview.appspot.com/16830004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206530 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
-rw-r--r--media/base/media_switches.cc3
-rw-r--r--media/base/media_switches.h2
-rw-r--r--media/base/run_all_unittests.cc5
3 files changed, 1 insertions, 9 deletions
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
index 98c0279..b1f6279 100644
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -18,9 +18,6 @@ const char kEnableOpusPlayback[] = "enable-opus-playback";
// Enables VP8 Alpha playback in media elements.
const char kEnableVp8AlphaPlayback[] = "enable-vp8-alpha-playback";
-// Enables VP9 playback in media elements.
-const char kEnableVp9Playback[] = "enable-vp9-playback";
-
// Set number of threads to use for video decoding.
const char kVideoThreads[] = "video-threads";
diff --git a/media/base/media_switches.h b/media/base/media_switches.h
index 3e547b2..08fdd37 100644
--- a/media/base/media_switches.h
+++ b/media/base/media_switches.h
@@ -20,8 +20,6 @@ MEDIA_EXPORT extern const char kEnableOpusPlayback[];
MEDIA_EXPORT extern const char kEnableVp8AlphaPlayback[];
-MEDIA_EXPORT extern const char kEnableVp9Playback[];
-
MEDIA_EXPORT extern const char kVideoThreads[];
#if defined(GOOGLE_TV)
diff --git a/media/base/run_all_unittests.cc b/media/base/run_all_unittests.cc
index 4a6d272..4274634 100644
--- a/media/base/run_all_unittests.cc
+++ b/media/base/run_all_unittests.cc
@@ -34,13 +34,10 @@ void TestSuiteNoAtExit::Initialize() {
// Run this here instead of main() to ensure an AtExitManager is already
// present.
media::InitializeMediaLibraryForTesting();
- // Enable VP9 video codec support for all media tests.
- // TODO(tomfinegan): Remove this once the VP9 flag is removed or negated.
- CommandLine* cmd_line = CommandLine::ForCurrentProcess();
- cmd_line->AppendSwitch(switches::kEnableVp9Playback);
// Enable VP8 alpha support for all media tests.
// TODO(tomfinegan): Remove this once the VP8 alpha flag is removed or
// negated.
+ CommandLine* cmd_line = CommandLine::ForCurrentProcess();
cmd_line->AppendSwitch(switches::kEnableVp8AlphaPlayback);
}