| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <tuple> | 5 #include <tuple> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
| (...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 SessionState::ACTIVE, SessionState::ACTIVE }, | 280 SessionState::ACTIVE, SessionState::ACTIVE }, |
| 281 { MediaSuspend::DISABLED, BackgroundResuming::ENABLED, | 281 { MediaSuspend::DISABLED, BackgroundResuming::ENABLED, |
| 282 SessionState::ACTIVE, SessionState::ACTIVE }, | 282 SessionState::ACTIVE, SessionState::ACTIVE }, |
| 283 { MediaSuspend::DISABLED, BackgroundResuming::ENABLED, | 283 { MediaSuspend::DISABLED, BackgroundResuming::ENABLED, |
| 284 SessionState::SUSPENDED, SessionState::SUSPENDED }, | 284 SessionState::SUSPENDED, SessionState::SUSPENDED }, |
| 285 }; | 285 }; |
| 286 | 286 |
| 287 Pipeline kPipelines[] = { | 287 Pipeline kPipelines[] = { |
| 288 Pipeline::WMPI, | 288 Pipeline::WMPI, |
| 289 #if defined(OS_ANDROID) | 289 #if defined(OS_ANDROID) |
| 290 Pipeline::WMPA, | 290 // Disabling WMPA tests because of https://crbug.com/646312 |
| 291 // Pipeline::WMPA, |
| 291 #endif // defined(OS_ANDROID) | 292 #endif // defined(OS_ANDROID) |
| 292 }; | 293 }; |
| 293 | 294 |
| 294 } // anonymous namespace | 295 } // anonymous namespace |
| 295 | 296 |
| 296 IN_PROC_BROWSER_TEST_P(MediaSessionVisibilityBrowserTest, | 297 IN_PROC_BROWSER_TEST_P(MediaSessionVisibilityBrowserTest, |
| 297 TestEntryPoint) { | 298 TestEntryPoint) { |
| 298 StartPlayer(); | 299 StartPlayer(); |
| 299 MaybePausePlayer(); | 300 MaybePausePlayer(); |
| 300 HideTab(); | 301 HideTab(); |
| 301 CheckSessionStateAfterHide(); | 302 CheckSessionStateAfterHide(); |
| 302 } | 303 } |
| 303 | 304 |
| 304 INSTANTIATE_TEST_CASE_P(MediaSessionVisibilityBrowserTestInstances, | 305 INSTANTIATE_TEST_CASE_P(MediaSessionVisibilityBrowserTestInstances, |
| 305 MediaSessionVisibilityBrowserTest, | 306 MediaSessionVisibilityBrowserTest, |
| 306 ::testing::Combine(::testing::ValuesIn(kTestParams), | 307 ::testing::Combine(::testing::ValuesIn(kTestParams), |
| 307 ::testing::ValuesIn(kPipelines))); | 308 ::testing::ValuesIn(kPipelines))); |
| 308 | 309 |
| 309 } // namespace content | 310 } // namespace content |
| OLD | NEW |