Fix memory leak in PrerenderDispatcher.

chrome/renderer/prerender/prerender_dispatcher.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 "chrome/renderer/prerender/prerender_dispatcher.h"
 
 #include "base/logging.h"
 #include "chrome/common/prerender_messages.h"
 #include "chrome/renderer/prerender/prerendering_support.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebPrerenderingSupport.h"
 
 namespace prerender {
 
-PrerenderDispatcher::PrerenderDispatcher() {
-  WebKit::WebPrerenderingSupport::initialize(new PrerenderingSupport());
+PrerenderDispatcher::PrerenderDispatcher()
+    : prerendering_support_(new PrerenderingSupport()) {
+  WebKit::WebPrerenderingSupport::initialize(prerendering_support_.get());

[dominich, 2012/05/15 16:06:25]

this seems like an arbitrary place to put this. For 1, the Dispatcher isn't
dispatching anything. And 2, it has nothing to do with
WebKit::WebPrerenderingSupport. I wonder if this should be initialized/destroyed
directly in the chrome_content_render_client alongside the PrerenderDispatcher.

I wonder if we should somehow make the parallels between the Dispatcher and
Tracker more obvious. PrerenderBrowserTracker and PrerenderRenderTracker maybe?
or PrerenderRenderViewTracker and PrerenderUrlTracker?

[gavinp, 2012/05/18 05:46:25]

OK, the new patch does it this way.
Sounds good.  Do you want to create a bug for this, or do you think I should
pull that into this CL?

[jam, 2012/05/18 16:38:15]

it seems that CCRC has less to do with prerendering than this file..

 }
 
 PrerenderDispatcher::~PrerenderDispatcher() {
+  if (prerendering_support_.get())
+    WebKit::WebPrerenderingSupport::shutdown();
 }
 
 bool PrerenderDispatcher::IsPrerenderURL(const GURL& url) const {
   return prerender_urls_.find(url) != prerender_urls_.end();
 }
 
 bool PrerenderDispatcher::OnControlMessageReceived(
     const IPC::Message& message) {
  bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PrerenderDispatcher, message)
@@ skipping 24 matching lines @@
   // is unlikely to go to the prerendered page.
   if (it == prerender_urls_.end())
     return;
   DCHECK(it->second > 0);
   it->second -= 1;
   if (it->second == 0)
     prerender_urls_.erase(it);
 }
 
 }  // namespace prerender