Add Start/Stop event signalling on Prerenders.

chrome/browser/prerender/prerender_link_manager.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/browser/prerender/prerender_link_manager.h"
 
 #include <limits>
 #include <utility>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 80 matching lines @@
 void PrerenderLinkManager::OnCancelPrerender(int child_id, int prerender_id) {
   DVLOG(2) << "OnCancelPrerender, child_id = " << child_id
            << ", prerender_id = " << prerender_id;
   const ChildAndPrerenderIdPair child_and_prerender_id(child_id, prerender_id);
   IdPairToPrerenderHandleMap::iterator id_to_handle_iter =
       ids_to_handle_map_.find(child_and_prerender_id);
   if (id_to_handle_iter == ids_to_handle_map_.end()) {
     DVLOG(5) << "... canceling a prerender that doesn't exist.";
     return;
   }
-  PrerenderHandle* prerender_handle = id_to_handle_iter->second;
+
+  scoped_ptr<PrerenderHandle> prerender_handle(id_to_handle_iter->second);
+  ids_to_handle_map_.erase(id_to_handle_iter);
   prerender_handle->OnCancel();
 
   // Because OnCancel() can remove the prerender from the map, we need to
   // consider our iterator invalid.
   id_to_handle_iter = ids_to_handle_map_.find(child_and_prerender_id);
   if (id_to_handle_iter != ids_to_handle_map_.end())
     RemovePrerender(id_to_handle_iter);
 }
 
 void PrerenderLinkManager::OnAbandonPrerender(int child_id, int prerender_id) {
@@ skipping 88 matching lines @@
   if (it == ids_to_handle_map_.end())
     return;
   const int child_id = it->first.first;
   const int prerender_id = it->first.second;
 
   Send(child_id, new PrerenderMsg_OnPrerenderStop(prerender_id));
   RemovePrerender(it);
 }
 
 }  // namespace prerender