Remove kDisableUnifiedMediaPipeline

content/browser/media/session/media_session_impl_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 <tuple>
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 15 matching lines @@
 static const char kStartPlayerScript[] =
     "document.getElementById('long-video').play()";
 static const char kPausePlayerScript[] =
     "document.getElementById('long-video').pause()";
 
 enum class MediaSuspend {
   ENABLED,
   DISABLED,
 };
 
-enum class Pipeline {
-  WMPI,
-  WMPA,
-};
-
 enum class BackgroundResuming {
   ENABLED,
   DISABLED,
 };
 
 enum class SessionState {
   ACTIVE,
   SUSPENDED,
   INACTIVE,
 };
 
 struct VisibilityTestData {
   MediaSuspend media_suspend;
   BackgroundResuming background_resuming;
   SessionState session_state_before_hide;
   SessionState session_state_after_hide;
 };
 }
 
 // Base class of MediaSession visibility tests. The class is intended
 // to be used to run tests under different configurations. Tests
 // should inheret from this class, set up their own command line per
 // their configuration, and use macro INCLUDE_TEST_FROM_BASE_CLASS to
 // include required tests. See
 // media_session_visibility_browsertest_instances.cc for examples.
 class MediaSessionImplVisibilityBrowserTest
     : public ContentBrowserTest,
-      public ::testing::WithParamInterface<
-          std::tr1::tuple<VisibilityTestData, Pipeline>> {
+      public ::testing::WithParamInterface<VisibilityTestData> {
  public:
   MediaSessionImplVisibilityBrowserTest() = default;
   ~MediaSessionImplVisibilityBrowserTest() override = default;
 
   void SetUpOnMainThread() override {
     ContentBrowserTest::SetUpOnMainThread();
     web_contents_ = shell()->web_contents();
     media_session_ = MediaSessionImpl::Get(web_contents_);
 
     media_session_state_loop_runners_[MediaSessionImpl::State::ACTIVE] =
@@ skipping 29 matching lines @@
     command_line->AppendSwitch(switches::kEnableDefaultMediaSession);
 #endif  // !defined(OS_ANDROID)
 
     VisibilityTestData params = GetVisibilityTestData();
 
     if (params.media_suspend == MediaSuspend::ENABLED)
       command_line->AppendSwitch(switches::kEnableMediaSuspend);
     else
       command_line->AppendSwitch(switches::kDisableMediaSuspend);
 
-#if defined(OS_ANDROID)
-    Pipeline pipeline = std::tr1::get<1>(GetParam());
-    if (pipeline == Pipeline::WMPA)
-      command_line->AppendSwitch(switches::kDisableUnifiedMediaPipeline);
-#endif  // defined(OS_ANDROID)
-
     if (params.background_resuming == BackgroundResuming::ENABLED) {
       command_line->AppendSwitchASCII(switches::kEnableFeatures,
                                       media::kResumeBackgroundVideo.name);
     } else {
       command_line->AppendSwitchASCII(switches::kDisableFeatures,
                                       media::kResumeBackgroundVideo.name);
     }
   }
 
   const VisibilityTestData& GetVisibilityTestData() {
-    return std::tr1::get<0>(GetParam());
+    return GetParam();
   }
 
   void StartPlayer() {
     LoadTestPage();
 
     LOG(INFO) << "Starting player";
     ClearMediaSessionStateLoopRunners();
     RunScript(kStartPlayerScript);
     LOG(INFO) << "Waiting for session to be active";
     WaitForMediaSessionState(MediaSessionImpl::State::ACTIVE);
@@ skipping 123 matching lines @@
     {MediaSuspend::DISABLED, BackgroundResuming::DISABLED,
      SessionState::SUSPENDED, SessionState::SUSPENDED},
     {MediaSuspend::DISABLED, BackgroundResuming::DISABLED, SessionState::ACTIVE,
      SessionState::ACTIVE},
     {MediaSuspend::DISABLED, BackgroundResuming::ENABLED, SessionState::ACTIVE,
      SessionState::ACTIVE},
     {MediaSuspend::DISABLED, BackgroundResuming::ENABLED,
      SessionState::SUSPENDED, SessionState::SUSPENDED},
 };
 
-Pipeline kPipelines[] = {
-    Pipeline::WMPI,
-#if defined(OS_ANDROID)
-// Disabling WMPA tests because of https://crbug.com/646312
-// Pipeline::WMPA,
-#endif  // defined(OS_ANDROID)
-};
-
 }  // anonymous namespace
 
 IN_PROC_BROWSER_TEST_P(MediaSessionImplVisibilityBrowserTest, TestEntryPoint) {
   StartPlayer();
   MaybePausePlayer();
   HideTab();
   CheckSessionStateAfterHide();
 }
 
 INSTANTIATE_TEST_CASE_P(MediaSessionImplVisibilityBrowserTestInstances,
                         MediaSessionImplVisibilityBrowserTest,
-                        ::testing::Combine(::testing::ValuesIn(kTestParams),
-                                           ::testing::ValuesIn(kPipelines)));
+                        ::testing::ValuesIn(kTestParams));
 
 }  // namespace content