commit fd4eaf45f5aa8198d1b065fdc262b66550d57332
author Robert Flack <flackr@chromium.org> Tue Apr 23 14:40:37 2019
committer Commit Bot <commit-bot@chromium.org> Tue Apr 23 14:40:37 2019
tree c8066feef0cb1717ab66ac669871171d3467a7c5
parent e92b514d29abc86de9b6390c47949b6efcea37a2

Revert "Fix flaky chrome://webrtc-internals stats reporting bug."

This reverts commit a7c927104736bea0fea348aef0b402c92c1d9c8a.

Reason for revert: This appears to have broken content_browsertests, failure here: https://ci.chromium.org/p/chromium/builders/ci/Linux%20Tests/77190

Sample output:

[ RUN      ] WebRtcInternalsBrowserTest.BweCompoundGraph
Xlib:  extension "RANDR" missing on display ":107".

DevTools listening on ws://127.0.0.1:43262/devtools/browser/38596d5e-bce2-4f71-b1d3-3d8e63d6e250
../../content/browser/webrtc/webrtc_internals_browsertest.cc:219: Failure
Value of: result
  Actual: false
Expected: true
Stack trace:
#0 0x55905678adff StackTraceGetter::CurrentStackTrace()
#1 0x5590567942fc testing::internal::UnitTestImpl::CurrentOsStackTraceExceptTop()
#2 0x559056793c49 testing::internal::AssertHelper::operator=()
#3 0x559055ef1064 content::WebRtcInternalsBrowserTest::VerifyElementWithId()
#4 0x559055ef186e content::WebRtcInternalsBrowserTest::VerifyStatsTable()
#5 0x559055ee8030 content::WebRtcInternalsBrowserTest::ExecuteAndVerifyAddStats()
#6 0x559055ee9482 content::WebRtcInternalsBrowserTest_BweCompoundGraph_Test::RunTestOnMainThread()
#7 0x559057b8a851 content::BrowserTestBase::ProxyRunTestOnMainThreadLoop()
#8 0x559057becee5 content::ShellBrowserMainParts::PreMainMessageLoopRun()
#9 0x559057538def content::BrowserMainLoop::PreMainMessageLoopRun()
#10 0x5590578f5017 content::StartupTaskRunner::RunAllTasksNow()
#11 0x559057537a08 content::BrowserMainLoop::CreateStartupTasks()
#12 0x55905753ac82 content::BrowserMainRunnerImpl::Initialize()
#13 0x559057be9976 ShellBrowserMain()
#14 0x559057be5fd9 content::ShellMainDelegate::RunProcess()
#15 0x559057448efd content::ContentMainRunnerImpl::RunServiceManager()
#16 0x559057448bc6 content::ContentMainRunnerImpl::Run()
#17 0x5590593dc10b service_manager::Main()
#18 0x559056920b71 content::ContentMain()

../../content/browser/webrtc/webrtc_internals_browsertest.cc:219: Failure
Value of: result
  Actual: false
Expected: true
Stack trace:
#0 0x55905678adff StackTraceGetter::CurrentStackTrace()
#1 0x5590567942fc testing::internal::UnitTestImpl::CurrentOsStackTraceExceptTop()
#2 0x559056793c49 testing::internal::AssertHelper::operator=()
#3 0x559055ef1064 content::WebRtcInternalsBrowserTest::VerifyElementWithId()
#4 0x559055ef1a4c content::WebRtcInternalsBrowserTest::VerifyStatsTableRow()
#5 0x559055ef1893 content::WebRtcInternalsBrowserTest::VerifyStatsTable()
#6 0x559055ee8030 content::WebRtcInternalsBrowserTest::ExecuteAndVerifyAddStats()
#7 0x559055ee9482 content::WebRtcInternalsBrowserTest_BweCompoundGraph_Test::RunTestOnMainThread()
#8 0x559057b8a851 content::BrowserTestBase::ProxyRunTestOnMainThreadLoop()
#9 0x559057becee5 content::ShellBrowserMainParts::PreMainMessageLoopRun()
#10 0x559057538def content::BrowserMainLoop::PreMainMessageLoopRun()
#11 0x5590578f5017 content::StartupTaskRunner::RunAllTasksNow()
#12 0x559057537a08 content::BrowserMainLoop::CreateStartupTasks()
#13 0x55905753ac82 content::BrowserMainRunnerImpl::Initialize()
#14 0x559057be9976 ShellBrowserMain()
#15 0x559057be5fd9 content::ShellMainDelegate::RunProcess()
#16 0x559057448efd content::ContentMainRunnerImpl::RunServiceManager()
#17 0x559057448bc6 content::ContentMainRunnerImpl::Run()
#18 0x5590593dc10b service_manager::Main()
#19 0x559056920b71 content::ContentMain()

Please avoid using NOTRY=true unless necessary as it can result in unexpected breakages like this.

Original change's description:
> Fix flaky chrome://webrtc-internals stats reporting bug.
> 
> A timer polls stats regularly, using standard or legacy stats as
> specified in a UI. Which stats to use can change while a pending request
> is in progress. This CL adds a check to discard legacy stats that are
> given to JS if we are not currently expecting legacy stats.
> This is something we were already doing for addStandardStats() but had
> forgotten to add to addLegacyStats(). The bug was only apparent every
> now and then depending on timing.
> 
> Drive-by: Rename "nukeStatsList" to "clearStatsList"
> 
> NOTRY=True
> 
> Bug: 803014
> Change-Id: I5323d58f25792c2b34f2432fe1e8482008db1f39
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1578608
> Reviewed-by: Guido Urdaneta <guidou@chromium.org>
> Commit-Queue: Henrik Boström <hbos@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#653146}

TBR=hbos@chromium.org,guidou@chromium.org

Change-Id: I7d2f36c3482366d9de784365e5198d027aa9a010
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 803014
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1576330
Reviewed-by: Robert Flack <flackr@chromium.org>
Commit-Queue: Robert Flack <flackr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#653171}