Revert "Flip unified media pipeline to default-on w/ disabled holdback."

media/base/media_switches.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 #include "media/base/media_switches.h"
 
 namespace switches {
 
 // Allow users to specify a custom buffer size for debugging purpose.
 const char kAudioBufferSize[] = "audio-buffer-size";
 
 // Set number of threads to use for video decoding.
 const char kVideoThreads[] = "video-threads";
 
 // Suspend media pipeline on background tabs.
 const char kEnableMediaSuspend[] = "enable-media-suspend";
 const char kDisableMediaSuspend[] = "disable-media-suspend";
 
 #if defined(OS_ANDROID)
 // Sets the MediaSource player that uses UI thread for frame processing.
 const char kDisableMediaThreadForMediaPlayback[] =
     "disable-media-thread-for-media-playback";
 
-// Use WebMediaPlayerAndroid instead of WebMediaPlayerImpl. This is a temporary
-// switch for holding back the new unified media pipeline.
-const char kDisableUnifiedMediaPipeline[] = "disable-unified-media-pipeline";
-
 // Sets the MediaSource player that uses the separate media thread
 const char kEnableMediaThreadForMediaPlayback[] =
     "enable-media-thread-for-media-playback";
+
+// Use WebMediaPlayerImpl instead of WebMediaPlayerAndroid. This is a temporary
+// switch for experimenting with unifying the Android playback pipeline.
+const char kEnableUnifiedMediaPipeline[] = "enable-unified-media-pipeline";
 #endif
 
 #if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_SOLARIS)
 // The Alsa device to use when opening an audio input stream.
 const char kAlsaInputDevice[] = "alsa-input-device";
 // The Alsa device to use when opening an audio stream.
 const char kAlsaOutputDevice[] = "alsa-output-device";
 #endif
 
 // Use GpuMemoryBuffers for Video Capture when this is an option for the device.
@@ skipping 74 matching lines @@
 
 }  // namespace switches
 
 namespace media {
 
 // Use shared block-based buffering for media.
 const base::Feature kUseNewMediaCache{"use-new-media-cache",
                                       base::FEATURE_DISABLED_BY_DEFAULT};
 
 }  // namespace media