Chromium Code Reviews| Index: content/browser/media/session/media_session_visibility_browsertest_instances.cc |
| diff --git a/content/browser/media/session/media_session_visibility_browsertest_instances.cc b/content/browser/media/session/media_session_visibility_browsertest_instances.cc |
| new file mode 100644 |
| index 0000000000000000000000000000000000000000..440452484597806c3c123f62f2dbd042ea166e66 |
| --- /dev/null |
| +++ b/content/browser/media/session/media_session_visibility_browsertest_instances.cc |
| @@ -0,0 +1,79 @@ |
| +// 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_visibility_browsertest_base.h" |
| +#include "media/base/media_switches.h" |
| + |
| +using content::MediaSessionVisibilityBrowserTestBase; |
| + |
| +// UnifiedPipeline + SuspendOnHide |
| +class MediaSessionVisibilityBrowserTest_UnifiedPipeline_SuspendOnHide : |
| + public MediaSessionVisibilityBrowserTestBase { |
| + void SetUpCommandLine(base::CommandLine* command_line) override { |
| + MediaSessionVisibilityBrowserTestBase::SetUpCommandLine(command_line); |
| +#if defined(OS_ANDROID) |
| + command_line->AppendSwitch(switches::kEnableUnifiedMediaPipeline); |
| +#else // 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 MediaSessionVisibilityBrowserTestBase { |
| + void SetUpCommandLine(base::CommandLine* command_line) override { |
| + MediaSessionVisibilityBrowserTestBase::SetUpCommandLine(command_line); |
| +#if defined(OS_ANDROID) |
| + command_line->AppendSwitch(switches::kEnableUnifiedMediaPipeline); |
| + 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 MediaSessionVisibilityBrowserTestBase { |
|
mlamouri (slow - plz ping)
2016/03/31 10:27:53
I think you might need to use a kDisableUnifiedMed
Zhiqiang Zhang (Slow)
2016/03/31 13:00:19
Done.
|
| +}; |
| + |
| +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 MediaSessionVisibilityBrowserTestBase { |
| + void SetUpCommandLine(base::CommandLine* command_line) override { |
| + MediaSessionVisibilityBrowserTestBase::SetUpCommandLine(command_line); |
| + 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) |