-
Mark Pearson authored
This reverts commit dde3defc. Reason for revert: browser_tests on linux-lacros-tester-rel consistently fail after this landed in https://ci.chromium.org/p/chromium/builders/ci/linux-lacros-tester-rel/4381 Failures are: MediaKeysListenerManagerImplTest.ListensToTheCorrectMediaKeys MediaKeysListenerManagerImplTest.PressPlayPauseKey MediaKeysListenerManagerImplTest.OtherDelegatesPreemptHardwareKeyMediaController They all crash: [ RUN ] MediaKeysListenerManagerImplTest.ListensToTheCorrectMediaKeys DevTools listening on ws://127.0.0.1:37255/devtools/browser/5be580d5-fcf2-46b2-8f43-033ac20657af [22277:22277:1109/134807.593313:WARNING:ozone_platform_wayland.cc(200)] Failed to find drm render node path. BrowserTestBase received signal: Segmentation fault. Backtrace: #0 0x55ec232b31d9 base::debug::CollectStackTrace() #1 0x55ec2322bc63 base::debug::StackTrace::StackTrace() #2 0x55ec22e77786 content::(anonymous namespace)::DumpStackTraceSignalHandler() #3 0x7f5f63b034c0 (/lib/x86_64-linux-gnu/libc-2.23.so+0x354bf) #4 0x55ec20957235 content::MediaKeysListenerManagerImplTest::SetUpOnMainThread() #5 0x55ec22e76577 content::BrowserTestBase::ProxyRunTestOnMainThreadLoop() #6 0x55ec22f20fde content::ShellBrowserMainParts::PreMainMessageLoopRun() #7 0x55ec226b9896 content::BrowserMainLoop::PreMainMessageLoopRun() #8 0x55ec22b09c33 content::StartupTaskRunner::RunAllTasksNow() #9 0x55ec226b8877 content::BrowserMainLoop::CreateStartupTasks() #10 0x55ec226bb278 content::BrowserMainRunnerImpl::Initialize() #11 0x55ec226b6f68 content::BrowserMain() #12 0x55ec218feeb3 content::ContentMainRunnerImpl::RunServiceManager() #13 0x55ec218feaa6 content::ContentMainRunnerImpl::Run() #14 0x55ec218fbf54 content::RunContentProcess() #15 0x55ec218fc8dc content::ContentMain() #16 0x55ec22e75f8c content::BrowserTestBase::SetUp() #17 0x55ec21670678 testing::Test::Run() #18 0x55ec2167150f testing::TestInfo::Run() #19 0x55ec21671ef7 testing::TestSuite::Run() #20 0x55ec2167f677 testing::internal::UnitTestImpl::RunAllTests() #21 0x55ec2167efdf testing::UnitTest::Run() #22 0x55ec22ebf284 base::TestSuite::Run() #23 0x55ec22e48027 content::ContentTestLauncherDelegate::RunTestSuite() #24 0x55ec22e9a871 content::LaunchTests() #25 0x55ec22e47fe0 main #26 0x7f5f63aee840 __libc_start_main #27 0x55ec1fce43ea _start [ RUN ] MediaKeysListenerManagerImplTest.OtherDelegatesPreemptHardwareKeyMediaController DevTools listening on ws://127.0.0.1:37481/devtools/browser/4cec391a-3d7f-4854-bdcf-7c8abf8b0cbe BrowserTestBase received signal: Segmentation fault. Backtrace: [25621:25621:1109/134831.864948:WARNING:ozone_platform_wayland.cc(200)] Failed to find drm render node path. #0 0x5636f5a041d9 base::debug::CollectStackTrace() #1 0x5636f597cc63 base::debug::StackTrace::StackTrace() #2 0x5636f55c8786 content::(anonymous namespace)::DumpStackTraceSignalHandler() #3 0x7fbfcb8e44c0 (/lib/x86_64-linux-gnu/libc-2.23.so+0x354bf) #4 0x5636f30a8235 content::MediaKeysListenerManagerImplTest::SetUpOnMainThread() #5 0x5636f55c7577 content::BrowserTestBase::ProxyRunTestOnMainThreadLoop() #6 0x5636f5671fde content::ShellBrowserMainParts::PreMainMessageLoopRun() #7 0x5636f4e0a896 content::BrowserMainLoop::PreMainMessageLoopRun() #8 0x5636f525ac33 content::StartupTaskRunner::RunAllTasksNow() #9 0x5636f4e09877 content::BrowserMainLoop::CreateStartupTasks() #10 0x5636f4e0c278 content::BrowserMainRunnerImpl::Initialize() #11 0x5636f4e07f68 content::BrowserMain() #12 0x5636f404feb3 content::ContentMainRunnerImpl::RunServiceManager() #13 0x5636f404faa6 content::ContentMainRunnerImpl::Run() #14 0x5636f404cf54 content::RunContentProcess() #15 0x5636f404d8dc content::ContentMain() #16 0x5636f55c6f8c content::BrowserTestBase::SetUp() #17 0x5636f3dc1678 testing::Test::Run() #18 0x5636f3dc250f testing::TestInfo::Run() #19 0x5636f3dc2ef7 testing::TestSuite::Run() #20 0x5636f3dd0677 testing::internal::UnitTestImpl::RunAllTests() #21 0x5636f3dcffdf testing::UnitTest::Run() #22 0x5636f5610284 base::TestSuite::Run() #23 0x5636f5599027 content::ContentTestLauncherDelegate::RunTestSuite() #24 0x5636f55eb871 content::LaunchTests() #25 0x5636f5598fe0 main #26 0x7fbfcb8cf840 __libc_start_main #27 0x5636f24353ea _start [ RUN ] MediaKeysListenerManagerImplTest.PressPlayPauseKey DevTools listening on ws://127.0.0.1:36939/devtools/browser/4a443d13-30b6-430d-a4b3-503ecbbdc73e [4137:4137:1109/134809.976176:WARNING:ozone_platform_wayland.cc(200)] Failed to find drm render node path. BrowserTestBase received signal: Segmentation fault. Backtrace: #0 0x5647f92c11d9 base::debug::CollectStackTrace() #1 0x5647f9239c63 base::debug::StackTrace::StackTrace() #2 0x5647f8e85786 content::(anonymous namespace)::DumpStackTraceSignalHandler() #3 0x7f6dac3524c0 (/lib/x86_64-linux-gnu/libc-2.23.so+0x354bf) #4 0x5647f6965235 content::MediaKeysListenerManagerImplTest::SetUpOnMainThread() #5 0x5647f8e84577 content::BrowserTestBase::ProxyRunTestOnMainThreadLoop() #6 0x5647f8f2efde content::ShellBrowserMainParts::PreMainMessageLoopRun() #7 0x5647f86c7896 content::BrowserMainLoop::PreMainMessageLoopRun() #8 0x5647f8b17c33 content::StartupTaskRunner::RunAllTasksNow() #9 0x5647f86c6877 content::BrowserMainLoop::CreateStartupTasks() #10 0x5647f86c9278 content::BrowserMainRunnerImpl::Initialize() #11 0x5647f86c4f68 content::BrowserMain() #12 0x5647f790ceb3 content::ContentMainRunnerImpl::RunServiceManager() #13 0x5647f790caa6 content::ContentMainRunnerImpl::Run() #14 0x5647f7909f54 content::RunContentProcess() #15 0x5647f790a8dc content::ContentMain() #16 0x5647f8e83f8c content::BrowserTestBase::SetUp() #17 0x5647f767e678 testing::Test::Run() #18 0x5647f767f50f testing::TestInfo::Run() #19 0x5647f767fef7 testing::TestSuite::Run() #20 0x5647f768d677 testing::internal::UnitTestImpl::RunAllTests() #21 0x5647f768cfdf testing::UnitTest::Run() #22 0x5647f8ecd284 base::TestSuite::Run() #23 0x5647f8e56027 content::ContentTestLauncherDelegate::RunTestSuite() #24 0x5647f8ea8871 content::LaunchTests() #25 0x5647f8e55fe0 main #26 0x7f6dac33d840 __libc_start_main #27 0x5647f5cf23ea _start Original change's description: > Reland "[Media Session] Fix for Lacros" > > This is a reland of ddb531f7 > > There is a fix in media_session_service.cc to allow the tests to pass > when ash-chrome is not running. > > Original change's description: > > [Media Session] Fix for Lacros > > > > At the moment in Lacros there are two instances of the > > Media Session Service (MSS) one hosted in ash-chrome and > > the other in lacros-chrome. This means that sessions in > > either browser process cannot see sessions from the other. > > > > This changes it so when a client asks for lacros-chrome > > MSS instead of providing a locally hosted MSS it binds > > the MSS in ash-chrome. > > > > BUG=1140215 > > > > Change-Id: Ic155a6cd928f0735095f849f309f9075dbb1d36f > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2485850 > > Reviewed-by: Avi Drissman <avi@chromium.org> > > Reviewed-by: Tommy Steimel <steimel@chromium.org> > > Reviewed-by: Daniel Cheng <dcheng@chromium.org> > > Reviewed-by: Erik Chen <erikchen@chromium.org> > > Commit-Queue: Becca Hughes <beccahughes@chromium.org> > > Cr-Commit-Position: refs/heads/master@{#825016} > > Bug: 1140215 > Change-Id: I64834d9be778998b42bf3447444a6955265215ef > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2525851 > Reviewed-by: Daniel Cheng <dcheng@chromium.org> > Reviewed-by: Tommy Steimel <steimel@chromium.org> > Reviewed-by: Erik Chen <erikchen@chromium.org> > Reviewed-by: Avi Drissman <avi@chromium.org> > Commit-Queue: Becca Hughes <beccahughes@chromium.org> > Cr-Commit-Position: refs/heads/master@{#825439} TBR=avi@chromium.org,dcheng@chromium.org,erikchen@chromium.org,beccahughes@chromium.org,steimel@chromium.org Change-Id: I284aea77c32a39c8641df70d83baa5b2e09b8641 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 1140215 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2528306Reviewed-by:
Mark Pearson <mpearson@chromium.org> Commit-Queue: Mark Pearson <mpearson@chromium.org> Cr-Commit-Position: refs/heads/master@{#825549}
23f48a7f
