The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/3a7d38f42891b83a503228607435586dc1f55465

commit 3a7d38f42891b83a503228607435586dc1f55465
Author: dalecurtis <dalecurtis@chromium.org>
Date: Mon Mar 07 21:17:13 2016

Fix media memory usage reporting after a pipeline suspend.

This resolves a couple issues:
- Stops the memory usage reporting timer when hidden.
- Clears the audio/video memory PipelineStatistics entries upon
  PipelineImpl completing its suspend.

BUG= 592186 
TEST=new unittest, manually verify timer stops in bg.

Review URL: https://codereview.chromium.org/1769743002

Cr-Commit-Position: refs/heads/master@{#379644}

[modify] https://crrev.com/3a7d38f42891b83a503228607435586dc1f55465/media/base/pipeline_impl.cc
[modify] https://crrev.com/3a7d38f42891b83a503228607435586dc1f55465/media/base/pipeline_impl_unittest.cc
[modify] https://crrev.com/3a7d38f42891b83a503228607435586dc1f55465/media/blink/webmediaplayer_impl.cc

We'll want to merge this to M-50 before launching beta channel experiments to avoid ticking timers in the background.  Will keep it open for now.

Your change meets the bar and is auto-approved for M50 (branch: 2661)

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/b6a32ade861a645226d2a436b5fbfed4133129ed

commit b6a32ade861a645226d2a436b5fbfed4133129ed
Author: Dale Curtis <dalecurtis@chromium.org>
Date: Fri Mar 18 23:52:16 2016

Merge M50: "Fix media memory usage reporting after a pipeline suspend."

This resolves a couple issues:
- Stops the memory usage reporting timer when hidden.
- Clears the audio/video memory PipelineStatistics entries upon
  PipelineImpl completing its suspend.

BUG= 592186 
TEST=new unittest, manually verify timer stops in bg.

Review URL: https://codereview.chromium.org/1769743002

Cr-Commit-Position: refs/heads/master@{#379644}
(cherry picked from commit 3a7d38f42891b83a503228607435586dc1f55465)

Review URL: https://codereview.chromium.org/1815883002 .

Cr-Commit-Position: refs/branch-heads/2661@{#293}
Cr-Branched-From: ef6f6ae5e4c96622286b563658d5cd62a6cf1197-refs/heads/master@{#378081}

[modify] https://crrev.com/b6a32ade861a645226d2a436b5fbfed4133129ed/media/base/pipeline_impl.cc
[modify] https://crrev.com/b6a32ade861a645226d2a436b5fbfed4133129ed/media/base/pipeline_impl_unittest.cc
[modify] https://crrev.com/b6a32ade861a645226d2a436b5fbfed4133129ed/media/blink/webmediaplayer_impl.cc

Ack drover picked up the version w/ conflicts for some reason. Fix landing now.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/af84bda50c0bcf609a0e22cad7269bc7e34e0592

commit af84bda50c0bcf609a0e22cad7269bc7e34e0592
Author: Dale Curtis <dalecurtis@chromium.org>
Date: Sat Mar 19 00:01:05 2016

Fix incorrect merge due to drover choosing pre-conflict version :/

BUG= 592186 
TEST=none

(cherry picked from commit 01adeb3d793f14db63a3c9fdf5aff1d417a63522)

Review URL: https://codereview.chromium.org/1814413002 .

Cr-Commit-Position: refs/branch-heads/2661@{#294}
Cr-Branched-From: ef6f6ae5e4c96622286b563658d5cd62a6cf1197-refs/heads/master@{#378081}

[modify] https://crrev.com/af84bda50c0bcf609a0e22cad7269bc7e34e0592/media/blink/webmediaplayer_impl.cc