Remove kDisableUnifiedMediaPipeline

media/base/media.cc

 // Copyright 2013 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 "media/base/media.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
@@ skipping 69 matching lines @@
 }
 
 bool HasPlatformDecoderSupport() {
   return g_media_library.Pointer()->has_platform_decoder_support();
 }
 
 bool PlatformHasOpusSupport() {
   return base::android::BuildInfo::GetInstance()->sdk_int() >= 21;
 }
 
-bool IsUnifiedMediaPipelineEnabled() {
-  return !base::CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableUnifiedMediaPipeline);
-}
-
 bool ArePlatformDecodersAvailable() {

[xhwang, 2017/02/08 02:46:01]

Maybe we only need HasPlatformDecoderSupport() now.

[tguilbert, 2017/02/09 02:32:17]

I made the switch to HasPlatformDecoderSupport(), but forgot to delete this.
Thanks for catching it!

-  return IsUnifiedMediaPipelineEnabled()
-             ? HasPlatformDecoderSupport()
-             : MediaCodecUtil::IsMediaCodecAvailable();
+  return HasPlatformDecoderSupport();
 }
 #endif
 
 }  // namespace media