Another attempt at fixing dead frames being tracked by webNavigation

chrome/browser/extensions/api/web_navigation/web_navigation_api.cc

Index: chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
index 2e0b3c628a37ee585eb2561fe61c5c4d76396df6..2079550fe84ffaeeff0b7858c46435b4de38171e 100644
--- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
@@ -377,22 +377,33 @@ void WebNavigationTabObserver::DidCommitProvisionalLoadForFrame(
       render_view_host != pending_render_view_host_)
     return;
   FrameNavigationState::FrameID frame_id(frame_num, render_view_host);
-  FrameNavigationState::FrameID id_to_skip;
-  if (render_view_host == render_view_host_)
-    id_to_skip = frame_id;
-  if (is_main_frame)
-    SendErrorEvents(web_contents(), render_view_host_, id_to_skip);
-  render_view_host_ = render_view_host;
-  pending_render_view_host_ = NULL;
-
-  if (!navigation_state_.CanSendEvents(frame_id))
-    return;
 
   bool is_reference_fragment_navigation =
       IsReferenceFragmentNavigation(frame_id, url);
   bool is_history_navigation =
       navigation_state_.GetNavigationCommitted(frame_id);
 
+  if (is_main_frame &&
+      render_view_host_ == render_view_host &&
+      !is_reference_fragment_navigation &&
+      !is_history_navigation) {
+    SendErrorEvents(web_contents(), render_view_host_, frame_id);

[Charlie Reis, 2012/08/04 00:32:33]

Sorry, I don't understand this function.  Why is it sending error events when a
normal navigation is committing?

[jochen (gone - plz use gerrit), 2012/08/04 19:28:38]

iframes of a previous tab can still navigate while the main frame is navigating.
as soon as the main frame commits, we won't get signals for the old iframes any
more, so we should send error events for still pending navigatios.

+    if (pending_render_view_host_) {
+      SendErrorEvents(web_contents(),
+                      pending_render_view_host_,
+                      FrameNavigationState::FrameID());
+      pending_render_view_host_ = NULL;
+    }
+  } else if (pending_render_view_host_ == render_view_host) {
+    SendErrorEvents(
+        web_contents(), render_view_host_, FrameNavigationState::FrameID());
+    render_view_host_ = pending_render_view_host_;
+    pending_render_view_host_ = NULL;
+  }
+
+  if (!navigation_state_.CanSendEvents(frame_id))
+    return;
+
   // Update the URL as it might have changed.
   navigation_state_.UpdateFrame(frame_id, url);
   navigation_state_.SetNavigationCommitted(frame_id);