When committing a provisional load that didn't change the RVH, still abort pending navigations.

chrome/browser/extensions/api/web_navigation/web_navigation_api.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.
 
 // Implements the Chrome Extensions WebNavigation API.
 
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
 
 #include "base/lazy_instance.h"
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_constants.h"
@@ skipping 299 matching lines @@
 
     case content::NOTIFICATION_RENDER_VIEW_HOST_DELETED: {
       content::RenderViewHost* render_view_host =
           content::Source<content::RenderViewHost>(source).ptr();
       if (render_view_host == render_view_host_)
         render_view_host_ = NULL;
       else if (render_view_host == pending_render_view_host_)
         pending_render_view_host_ = NULL;
       else
         return;
-      SendErrorEvents(web_contents(), render_view_host);
+      SendErrorEvents(
+          web_contents(), render_view_host, FrameNavigationState::FrameID());
       break;
     }
 
     default:
       NOTREACHED();
   }
 }
 
 void WebNavigationTabObserver::AboutToNavigateRenderView(
     content::RenderViewHost* render_view_host) {
   if (!render_view_host_) {
     render_view_host_ = render_view_host;
   } else if (render_view_host != render_view_host_) {
-    if (pending_render_view_host_)
-      SendErrorEvents(web_contents(), pending_render_view_host_);
+    if (pending_render_view_host_) {
+      SendErrorEvents(web_contents(),
+                      pending_render_view_host_,
+                      FrameNavigationState::FrameID());
+    }
     pending_render_view_host_ = render_view_host;
   }
 }
 
 void WebNavigationTabObserver::DidStartProvisionalLoadForFrame(
     int64 frame_num,
     bool is_main_frame,
     const GURL& validated_url,
     bool is_error_page,
     content::RenderViewHost* render_view_host) {
@@ skipping 19 matching lines @@
 
 void WebNavigationTabObserver::DidCommitProvisionalLoadForFrame(
     int64 frame_num,
     bool is_main_frame,
     const GURL& url,
     content::PageTransition transition_type,
     content::RenderViewHost* render_view_host) {
   if (render_view_host != render_view_host_ &&
       render_view_host != pending_render_view_host_)
     return;
-  if (render_view_host != render_view_host_)
-    SendErrorEvents(web_contents(), render_view_host_);
+  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)

[Matt Perry, 2012/08/02 12:59:31]

Did you mean to add this check for is_main_frame? The old code sent errors for
subframe frame loads too.

[jochen (gone - plz use gerrit), 2012/08/02 14:09:49]

The old check said "the pending RVH' commits, and only main frame navigations
can happen in a pending RVH.

Now I want to drop old navigations no matter what RVH commits its main frame

+    SendErrorEvents(web_contents(), render_view_host_, id_to_skip);
   render_view_host_ = render_view_host;
   pending_render_view_host_ = NULL;
 
-  FrameNavigationState::FrameID frame_id(frame_num, render_view_host);
   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);
 
   // Update the URL as it might have changed.
   navigation_state_.UpdateFrame(frame_id, url);
@@ skipping 51 matching lines @@
     stop_tracking_frames = true;
   }
 
   FrameNavigationState::FrameID frame_id(frame_num, render_view_host);
   if (navigation_state_.CanSendEvents(frame_id)) {
     navigation_state_.SetErrorOccurredInFrame(frame_id);
     helpers::DispatchOnErrorOccurred(
         web_contents(), render_view_host->GetProcess()->GetID(), validated_url,
         frame_num, is_main_frame, error_code);
   }
-  if (stop_tracking_frames)
-    navigation_state_.StopTrackingFramesInRVH(render_view_host);
+  if (stop_tracking_frames) {
+    navigation_state_.StopTrackingFramesInRVH(render_view_host,
+                                              FrameNavigationState::FrameID());
+  }
 }
 
 void WebNavigationTabObserver::DocumentLoadedInFrame(
     int64 frame_num,
     content::RenderViewHost* render_view_host) {
   if (render_view_host != render_view_host_)
     return;
   FrameNavigationState::FrameID frame_id(frame_num, render_view_host);
   if (!navigation_state_.CanSendEvents(frame_id))
     return;
@@ skipping 66 matching lines @@
       new_contents->GetBrowserContext(),
       source_frame_num,
       navigation_state_.IsMainFrame(frame_id),
       new_contents,
       url);
 }
 
 void WebNavigationTabObserver::WebContentsDestroyed(content::WebContents* tab) {
   g_tab_observer.Get().erase(tab);
   registrar_.RemoveAll();
-  SendErrorEvents(tab, NULL);
+  SendErrorEvents(tab, NULL, FrameNavigationState::FrameID());
 }
 
 void WebNavigationTabObserver::SendErrorEvents(
     content::WebContents* web_contents,
-    content::RenderViewHost* render_view_host) {
+    content::RenderViewHost* render_view_host,
+    FrameNavigationState::FrameID id_to_skip) {
   for (FrameNavigationState::const_iterator frame = navigation_state_.begin();
        frame != navigation_state_.end(); ++frame) {
     if (!navigation_state_.GetNavigationCompleted(*frame) &&
         navigation_state_.CanSendEvents(*frame) &&
+        *frame != id_to_skip &&
         (!render_view_host || frame->render_view_host == render_view_host)) {
+      navigation_state_.SetErrorOccurredInFrame(*frame);
       helpers::DispatchOnErrorOccurred(
         web_contents,

[Matt Perry, 2012/08/02 12:59:31]

nit: indent + 2

[jochen (gone - plz use gerrit), 2012/08/02 14:09:49]

Done.

         frame->render_view_host->GetProcess()->GetID(),
         navigation_state_.GetUrl(*frame),
         frame->frame_num,
         navigation_state_.IsMainFrame(*frame),
         net::ERR_ABORTED);
     }
   }
   if (render_view_host)
-    navigation_state_.StopTrackingFramesInRVH(render_view_host);
+    navigation_state_.StopTrackingFramesInRVH(render_view_host, id_to_skip);
 }
 
 // See also NavigationController::IsURLInPageNavigation.
 bool WebNavigationTabObserver::IsReferenceFragmentNavigation(
     FrameNavigationState::FrameID frame_id,
     const GURL& url) {
   GURL existing_url = navigation_state_.GetUrl(frame_id);
   if (existing_url == url)
     return false;
 
@@ skipping 95 matching lines @@
         navigation_state.IsMainFrame(frame_id), frame_id.frame_num);
     frame->process_id = frame_id.render_view_host->GetProcess()->GetID();
     frame->error_occurred = navigation_state.GetErrorOccurredInFrame(frame_id);
     result_list.push_back(frame);
   }
   results_ = GetAllFrames::Results::Create(result_list);
   return true;
 }
 
 }  // namespace extensions