Revert of Gardening: Revert "Use AudioStreamMonitor to control power save blocking...
commitbc6572e179e9fea88a60893d428ab8c3b363113a
authordalecurtis <dalecurtis@chromium.org>
Fri, 12 Sep 2014 19:22:30 +0000 (12 12:22 -0700)
committerCommit bot <commit-bot@chromium.org>
Fri, 12 Sep 2014 19:26:35 +0000 (12 19:26 +0000)
tree42d380f7a888f1d0323ef2384b3bf9f83540117f
parent130d3f51c1f3e284f707719af4d364447d4d3388
Revert of Gardening: Revert "Use AudioStreamMonitor to control power save blocking." (patchset #1 id:1 of https://codereview.chromium.org/562863002/)

Reason for revert:
Bugs should be fixed now... will CQ this revert.

Original issue's description:
> Gardening: Revert "Use AudioStreamMonitor to control power save blocking."
>
> This reverts commit 484d29dcb45ca362fc9049c37dd3a51e11492f14.
>
> This patch made media/media-controller-playbackrate.html test crash on DEBUG.
>
> it crashes at content/browser/web_contents/web_contents_impl.cc:4296 on DCHECK
> Looks like AddMediaPlayerEntry was called twice for the same player_cookie
>
> It is not clear how it happens due to async nature of the notification.
> The author is sleeping at the moment, so I decided to roll back the patch.
>
> BUG=
> TBR=dalecurtis@chromium.org
>
> Committed: https://crrev.com/0381a74131887eb13b5d457cce756fb7066411ea
> Cr-Commit-Position: refs/heads/master@{#294370}

TBR=loislo@chromium.org,jam@chromium.org,miu@chromium.org,scherkus@chromium.org
BUG=43667, 367785

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

Cr-Commit-Position: refs/heads/master@{#294630}
21 files changed:
chrome/browser/media/OWNERS
chrome/browser/media/audio_stream_monitor.cc [deleted file]
chrome/browser/media/media_capture_devices_dispatcher.cc
chrome/browser/media/media_capture_devices_dispatcher.h
chrome/browser/ui/tabs/tab_utils.cc
chrome/chrome_browser.gypi
chrome/chrome_tests_unit.gypi
content/browser/media/OWNERS
content/browser/media/audio_stream_monitor.cc [new file with mode: 0644]
content/browser/media/audio_stream_monitor.h [moved from chrome/browser/media/audio_stream_monitor.h with 58% similarity]
content/browser/media/audio_stream_monitor_unittest.cc [moved from chrome/browser/media/audio_stream_monitor_unittest.cc with 68% similarity]
content/browser/renderer_host/media/audio_renderer_host.cc
content/browser/web_contents/web_contents_impl.cc
content/browser/web_contents/web_contents_impl.h
content/browser/web_contents/web_contents_impl_unittest.cc
content/content_browser.gypi
content/content_tests.gypi
content/public/browser/media_observer.h
content/public/browser/web_contents.h
media/audio/audio_output_controller.cc
media/audio/audio_output_controller.h