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

media/base/media_switches.h

 // 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.
 
 // Defines all the "media" command-line switches.
 
 #ifndef MEDIA_BASE_MEDIA_SWITCHES_H_
 #define MEDIA_BASE_MEDIA_SWITCHES_H_
 
 #include "base/feature_list.h"
 #include "build/build_config.h"
 #include "media/base/media_export.h"
 
 namespace switches {
 
 MEDIA_EXPORT extern const char kAudioBufferSize[];
 
 MEDIA_EXPORT extern const char kVideoThreads[];
 
 MEDIA_EXPORT extern const char kEnableMediaSuspend[];
 MEDIA_EXPORT extern const char kDisableMediaSuspend[];
 
 #if defined(OS_ANDROID)
 MEDIA_EXPORT extern const char kDisableMediaThreadForMediaPlayback[];
-MEDIA_EXPORT extern const char kDisableUnifiedMediaPipeline[];
 MEDIA_EXPORT extern const char kEnableMediaThreadForMediaPlayback[];
+MEDIA_EXPORT extern const char kEnableUnifiedMediaPipeline[];
 #endif
 
 #if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_SOLARIS)
 MEDIA_EXPORT extern const char kAlsaInputDevice[];
 MEDIA_EXPORT extern const char kAlsaOutputDevice[];
 #endif
 
 MEDIA_EXPORT extern const char kUseGpuMemoryBuffersForCapture[];
 
 #if defined(OS_WIN)
@@ skipping 28 matching lines @@
 
 namespace media {
 
 // All features in alphabetical order. The features should be documented
 // alongside the definition of their values in the .cc file.
 MEDIA_EXPORT extern const base::Feature kUseNewMediaCache;
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MEDIA_SWITCHES_H_