Pass load events from prerenders to launching elements.

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/prerender_extra_data.h"
 #include "content/public/common/referrer.h"
@@ skipping 28 matching lines @@
   WebPrerender& prerender = it->second;
 
   // The prerender should only be null in unit tests.
   if (prerender.isNull())
     return;
 
   prerender.didStartPrerender();
   OnPrerenderAddAlias(prerender_id, prerender.url());
 }
 
+void PrerenderDispatcher::OnPrerenderStopLoading(int prerender_id) {
+  DCHECK_NE(0u, prerenders_.count(prerender_id));
+  std::map<int, WebPrerender>::iterator it = prerenders_.find(prerender_id);
+
+  WebPrerender& prerender = it->second;
+
+  // The prerender should only be null in unit tests.

[mmenke, 2012/12/27 19:11:08]

Do unit tests actually simulate this event?

[gavinp, 2012/12/28 13:23:15]

Yes. See PrerenderDispatcherTest.PrerenderDispatcherSingleRemove.

[mmenke, 2012/12/28 18:48:36]

It calls OnPrerenderStop, not OnPrerenderStopLoading (You'd actually need a new
unit test to call this function, since it didn't exist before, and is only
called by OnControlMessageReceived)

[gavinp, 2012/12/28 20:13:16]

Right. And since this function is a NOP and untestable from the unit test, I've
upgraded this test to a DCHECK(). 

+  if (prerender.isNull())
+    return;
+
+  prerender.didSendLoadForPrerender();
+}
+
 void PrerenderDispatcher::OnPrerenderAddAlias(int prerender_id,
                                               const GURL& url) {
   DCHECK_NE(0u, prerenders_.count(prerender_id));
   running_prerender_urls_.insert(
       std::multimap<GURL, int>::value_type(url, prerender_id));
 }
 
 void PrerenderDispatcher::OnPrerenderStop(int prerender_id) {
   DCHECK_NE(0u, prerenders_.count(prerender_id));
   WebPrerender& prerender = prerenders_[prerender_id];
@@ skipping 18 matching lines @@
 
     it = next;
   }
 }
 
 bool PrerenderDispatcher::OnControlMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PrerenderDispatcher, message)
     IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderStart, OnPrerenderStart)
+    IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderStopLoading,
+                        OnPrerenderStopLoading)
     IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderAddAlias, OnPrerenderAddAlias)
     IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderStop, OnPrerenderStop)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
 void PrerenderDispatcher::add(const WebPrerender& prerender) {
   const PrerenderExtraData& extra_data =
@@ skipping 15 matching lines @@
 }
 
 void PrerenderDispatcher::abandon(const WebPrerender& prerender) {
   const PrerenderExtraData& extra_data =
       PrerenderExtraData::FromPrerender(prerender);
   content::RenderThread::Get()->Send(
       new PrerenderHostMsg_AbandonLinkRelPrerender(extra_data.prerender_id()));
 }
 
 }  // namespace prerender