Fix a PowerSaveBlocker leak in WebContentsImpl.

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
===================================================================
--- content/browser/web_contents/web_contents_impl.cc	(revision 287233)
+++ content/browser/web_contents/web_contents_impl.cc	(working copy)
@@ -3033,7 +3033,6 @@
 void WebContentsImpl::OnMediaPlayingNotification(int64 player_cookie,
                                                  bool has_video,
                                                  bool has_audio) {
-// Chrome OS does its own detection of audio and video.
 #if !defined(OS_CHROMEOS)
   scoped_ptr<PowerSaveBlocker> blocker;
   if (has_video) {
@@ -3049,6 +3048,7 @@
   }
 
   if (blocker) {
+    delete power_save_blockers_[render_frame_message_source_][player_cookie];

[Avi (use Gerrit), 2014/08/07 15:30:06]

Gah.

I see that this fixes the problem, but can't we use linked_ptr or the like in
the map so we don't have to play this game of manual memory management/

     power_save_blockers_[render_frame_message_source_][player_cookie] =
         blocker.release();
   }
@@ -3056,7 +3056,6 @@
 }
 
 void WebContentsImpl::OnMediaPausedNotification(int64 player_cookie) {
-  // Chrome OS does its own detection of audio and video.
 #if !defined(OS_CHROMEOS)
   delete power_save_blockers_[render_frame_message_source_][player_cookie];
   power_save_blockers_[render_frame_message_source_].erase(player_cookie);
@@ -4213,15 +4212,19 @@
 
 void WebContentsImpl::ClearPowerSaveBlockers(
     RenderFrameHost* render_frame_host) {
+#if !defined(OS_CHROMEOS)
   STLDeleteValues(&power_save_blockers_[render_frame_host]);
   power_save_blockers_.erase(render_frame_host);
+#endif
 }
 
 void WebContentsImpl::ClearAllPowerSaveBlockers() {
+#if !defined(OS_CHROMEOS)
   for (PowerSaveBlockerMap::iterator i(power_save_blockers_.begin());
        i != power_save_blockers_.end(); ++i)
     STLDeleteValues(&power_save_blockers_[i->first]);
   power_save_blockers_.clear();
+#endif
 }
 
 gfx::Size WebContentsImpl::GetSizeForNewRenderView() {