Fix a PowerSaveBlocker leak in WebContentsImpl.

content/browser/web_contents/web_contents_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 3015 matching lines @@
 
 void WebContentsImpl::OnUpdateFaviconURL(
     const std::vector<FaviconURL>& candidates) {
   FOR_EACH_OBSERVER(WebContentsObserver, observers_,
                     DidUpdateFaviconURL(candidates));
 }
 
 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) {
     blocker = PowerSaveBlocker::Create(
         PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep, "Playing video");
 #if defined(OS_ANDROID)
     static_cast<PowerSaveBlockerImpl*>(blocker.get())
         ->InitDisplaySleepBlocker(GetView()->GetNativeView());
 #endif
   } else if (has_audio) {
     blocker = PowerSaveBlocker::Create(
         PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension, "Playing audio");
   }
 
   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();
   }
 #endif  // !defined(OS_CHROMEOS)
 }
 
 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);
 #endif  // !defined(OS_CHROMEOS)
 }
 
 void WebContentsImpl::OnFirstVisuallyNonEmptyPaint() {
   FOR_EACH_OBSERVER(WebContentsObserver, observers_,
                     DidFirstVisuallyNonEmptyPaint());
 }
@@ skipping 1136 matching lines @@
   CHECK(!browser_plugin_guest_);
   browser_plugin_guest_.reset(guest);
 }
 
 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() const {
   return browser_plugin_embedder_.get();
 }
 
 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() {
   gfx::Size size;
   if (delegate_)
     size = delegate_->GetSizeForNewRenderView(this);
   if (size.IsEmpty())
     size = GetContainerBounds().size();
   return size;
 }
@@ skipping 10 matching lines @@
   if (new_size != old_size)
     delegate_->UpdatePreferredSize(this, new_size);
 }
 
 void WebContentsImpl::ResumeResponseDeferredAtStart() {
   FrameTreeNode* node = frame_tree_.root();
   node->render_manager()->ResumeResponseDeferredAtStart();
 }
 
 }  // namespace content