-
Mark Pearson authored
This reverts commit 73932db2. Reason for revert: caused failure in https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Mac10.13%20Tests/3347 failures: MSE_ExternalClearKey/EncryptedMediaTest.Playback_VideoOnly_MP4/0 [ RUN ] MSE_ExternalClearKey/EncryptedMediaTest.Playback_VideoOnly_MP4/0 [51235:2819:0608/103709.237938:WARNING:notification_platform_bridge_mac.mm(510)] AlertNotificationService: XPC connection invalidated. 2018-06-08 10:37:09.383 browser_tests[51235:780694] *** Owner supplied to -[NSTrackingArea initWithRect:options:owner:userInfo:] referenced a deallocating object. Tracking area behavior is undefined. Break on NSTrackingAreaDeallocatingOwnerError to debug. BrowserTestBase received signal: Terminated: 15. Backtrace: 0 browser_tests 0x000000010ea3aeac base::debug::StackTrace::StackTrace(unsigned long) + 28 1 browser_tests 0x000000010efd4b45 content::(anonymous namespace)::DumpStackTraceSignalHandler(int) + 229 2 libsystem_platform.dylib 0x00007fff51ad5f5a _sigtramp + 26 3 browser_tests 0x000000010e9b6c3f base::internal::IncomingTaskQueue::PostPendingTask(base::PendingTask*) + 111 4 CoreFoundation 0x00007fff29e9bdc5 __CFRunLoopServiceMachPort + 341 5 CoreFoundation 0x00007fff29e9b117 __CFRunLoopRun + 1783 6 CoreFoundation 0x00007fff29e9a787 CFRunLoopRunSpecific + 487 7 HIToolbox 0x00007fff291a7e26 RunCurrentEventLoopInMode + 286 8 HIToolbox 0x00007fff291a7b96 ReceiveNextEventCommon + 613 9 HIToolbox 0x00007fff291a7914 _BlockUntilNextEventMatchingListInModeWithFilter + 64 10 AppKit 0x00007fff27472f5f _DPSNextEvent + 2085 11 AppKit 0x00007fff27c08b4c -[NSApplication(NSEvent) _nextEventMatchingEventMask:untilDate:inMode:dequeue:] + 3044 12 browser_tests 0x000000010eae2920 __71-[BrowserCrApplication nextEventMatchingMask:untilDate:inMode:dequeue:]_block_invoke + 64 13 browser_tests 0x000000010e9ab94a base::mac::CallWithEHFrame(void () block_pointer) + 10 14 browser_tests 0x000000010eae2854 -[BrowserCrApplication nextEventMatchingMask:untilDate:inMode:dequeue:] + 164 15 AppKit 0x00007fff27467d6d -[NSApplication run] + 764 16 browser_tests 0x000000010e9bbc0c base::MessagePumpNSApplication::DoRun(base::MessagePump::Delegate*) + 364 17 browser_tests 0x000000010e9ba72e base::MessagePumpCFRunLoopBase::Run(base::MessagePump::Delegate*) + 110 18 browser_tests 0x000000010e9dee55 base::RunLoop::Run() + 53 19 browser_tests 0x000000010effa3b9 content::WindowedNotificationObserver::Wait() + 153 20 browser_tests 0x000000010efd5959 content::WaitForLoadStop(content::WebContents*) + 105 21 browser_tests 0x000000010ea70771 InProcessBrowserTest::PreRunTestOnMainThread() + 161 22 browser_tests 0x000000010efd4778 content::BrowserTestBase::ProxyRunTestOnMainThreadLoop() + 280 23 browser_tests 0x000000010eae8a45 ChromeBrowserMainParts::PreMainMessageLoopRunImpl() + 4341 24 browser_tests 0x000000010eae784e ChromeBrowserMainParts::PreMainMessageLoopRun() + 62 25 browser_tests 0x000000010d57f283 content::BrowserMainLoop::PreMainMessageLoopRun() + 67 26 browser_tests 0x000000010d96b377 content::StartupTaskRunner::RunAllTasksNow() + 39 27 browser_tests 0x000000010d57dccd content::BrowserMainLoop::CreateStartupTasks() + 813 28 browser_tests 0x000000010d581562 content::BrowserMainRunnerImpl::Initialize(content::MainFunctionParams const&, std::__1::unique_ptr<content::BrowserProcessSubThread, std::__1::default_delete<content::BrowserProcessSubThread> >) + 98 29 browser_tests 0x000000010d57bd4c content::BrowserMain(content::MainFunctionParams const&, std::__1::unique_ptr<content::BrowserProcessSubThread, std::__1::default_delete<content::BrowserProcessSubThread> >) + 204 30 browser_tests 0x000000010e92fa77 content::ContentMainRunnerImpl::Run() + 615 31 browser_tests 0x000000011060dab5 service_manager::Main(service_manager::MainParams const&) + 2709 32 browser_tests 0x000000010e92ea74 content::ContentMain(content::ContentMainParams const&) + 68 33 browser_tests 0x000000010efd447b content::BrowserTestBase::SetUp() + 2571 34 browser_tests 0x000000010ea6f8d3 InProcessBrowserTest::SetUp() + 723 35 browser_tests 0x000000010ca9350d testing::Test::Run() + 109 36 browser_tests 0x000000010ca941a0 testing::TestInfo::Run() + 320 37 browser_tests 0x000000010ca94717 testing::TestCase::Run() + 279 38 browser_tests 0x000000010ca9fd87 testing::internal::UnitTestImpl::RunAllTests() + 871 39 browser_tests 0x000000010ca9f9fd testing::UnitTest::Run() + 109 40 browser_tests 0x000000010ea89786 base::TestSuite::Run() + 166 41 browser_tests 0x000000010e98b2f5 ChromeTestSuiteRunner::RunTestSuite(int, char**) + 37 42 browser_tests 0x000000010eff5f35 content::LaunchTests(content::TestLauncherDelegate*, unsigned long, int, char**) + 389 43 browser_tests 0x000000010e98b7db LaunchChromeTests(unsigned long, content::TestLauncherDelegate*, int, char**) + 347 44 browser_tests 0x000000010e98b26e main + 94 45 libdyld.dylib 0x00007fff51854115 start + 1 46 ??? 0x000000000000000a 0x0 + 10 Original change's description: > media: MediaBrowserTest not watching for plugin crash > > Now the CDM is not running in a plugin, there's no need for > MediaBrowserTest to watch for plugin crash. > > For the record, see the original CL that added this: > https://codereview.chromium.org/206693004 > > Bug: 772160 > Test: Remove obsolete code. No functionality change. > Change-Id: I8c0a9e74cc4c1d05b153f1e80a0882ee28287ac7 > Reviewed-on: https://chromium-review.googlesource.com/1091888 > Reviewed-by: Frank Liberato <liberato@chromium.org> > Commit-Queue: Xiaohan Wang <xhwang@chromium.org> > Cr-Commit-Position: refs/heads/master@{#565649} TBR=xhwang@chromium.org,liberato@chromium.org Change-Id: Ib80cd4be4d495c13f19196456ac621168acfa270 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 772160 Reviewed-on: https://chromium-review.googlesource.com/1093514Reviewed-by:
Mark Pearson <mpearson@chromium.org> Commit-Queue: Mark Pearson <mpearson@chromium.org> Cr-Commit-Position: refs/heads/master@{#565702}
56d3597e
