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

content/browser/media/session/media_session_visibility_browsertest.cc

 // Copyright 2016 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 "base/command_line.h"
 #include "content/browser/media/session/media_session.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
@@ skipping 178 matching lines @@
   }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Configuration instances.
 
 // UnifiedPipeline + SuspendOnHide
 class MediaSessionVisibilityBrowserTest_UnifiedPipeline_SuspendOnHide :
       public MediaSessionVisibilityBrowserTest {
   void SetUpCommandLine(base::CommandLine* command_line) override {
     MediaSessionVisibilityBrowserTest::SetUpCommandLine(command_line);
+    command_line->AppendSwitch(switches::kEnableUnifiedMediaPipeline);
 #if !defined(OS_ANDROID)
     command_line->AppendSwitch(switches::kEnableMediaSuspend);
 #endif  // defined(OS_ANDROID)
   }
 };
 
 INCLUDE_TEST_FROM_BASE_CLASS(
     MediaSessionVisibilityBrowserTest_UnifiedPipeline_SuspendOnHide,
     TestSessionInactiveWhenHiddenAfterContentPause)
 INCLUDE_TEST_FROM_BASE_CLASS(
     MediaSessionVisibilityBrowserTest_UnifiedPipeline_SuspendOnHide,
     TestSessionInactiveWhenHiddenWhilePlaying)
 
 // UnifiedPipeline + NosuspendOnHide
 class MediaSessionVisibilityBrowserTest_UnifiedPipeline_NosuspendOnHide :
       public MediaSessionVisibilityBrowserTest {
   void SetUpCommandLine(base::CommandLine* command_line) override {
     MediaSessionVisibilityBrowserTest::SetUpCommandLine(command_line);
+    command_line->AppendSwitch(switches::kEnableUnifiedMediaPipeline);
 #if defined(OS_ANDROID)
     command_line->AppendSwitch(switches::kDisableMediaSuspend);
 #endif  // defined(OS_ANDROID)
   }
 };
 
 INCLUDE_TEST_FROM_BASE_CLASS(
     MediaSessionVisibilityBrowserTest_UnifiedPipeline_NosuspendOnHide,
     TestSessionSuspendedWhenHiddenAfterContentPause)
 INCLUDE_TEST_FROM_BASE_CLASS(
     MediaSessionVisibilityBrowserTest_UnifiedPipeline_NosuspendOnHide,
     TestSessionActiveWhenHiddenWhilePlaying)
 
 #if defined(OS_ANDROID)
 // AndroidPipeline + SuspendOnHide
 class MediaSessionVisibilityBrowserTest_AndroidPipeline_SuspendOnHide :
       public MediaSessionVisibilityBrowserTest {
   void SetUpCommandLine(base::CommandLine* command_line) override {
     MediaSessionVisibilityBrowserTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kDisableUnifiedMediaPipeline);
   }
 };
 
 INCLUDE_TEST_FROM_BASE_CLASS(
     MediaSessionVisibilityBrowserTest_AndroidPipeline_SuspendOnHide,
     TestSessionInactiveWhenHiddenAfterContentPause)
 INCLUDE_TEST_FROM_BASE_CLASS(
     MediaSessionVisibilityBrowserTest_AndroidPipeline_SuspendOnHide,
     TestSessionInactiveWhenHiddenWhilePlaying)
 
 // AndroidPipeline + NosuspendOnHide
 class MediaSessionVisibilityBrowserTest_AndroidPipeline_NosuspendOnHide :
       public MediaSessionVisibilityBrowserTest {
   void SetUpCommandLine(base::CommandLine* command_line) override {
     MediaSessionVisibilityBrowserTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kDisableUnifiedMediaPipeline);
     command_line->AppendSwitch(switches::kDisableMediaSuspend);
   }
 };
 
 INCLUDE_TEST_FROM_BASE_CLASS(
     MediaSessionVisibilityBrowserTest_AndroidPipeline_NosuspendOnHide,
     TestSessionSuspendedWhenHiddenAfterContentPause)
 INCLUDE_TEST_FROM_BASE_CLASS(
     MediaSessionVisibilityBrowserTest_AndroidPipeline_NosuspendOnHide,
     TestSessionActiveWhenHiddenWhilePlaying)
 
 #endif  // defined(OS_ANDROID)
 
 }  // namespace content