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

chrome/browser/extensions/api/web_navigation/frame_navigation_state.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/extensions/api/web_navigation/frame_navigation_state.h"
 
 #include "base/logging.h"
 #include "chrome/common/url_constants.h"
 
 namespace extensions {
@@ skipping 85 matching lines @@
   frame_state.error_occurred = is_error_page;
   frame_state.url = url;
   frame_state.is_main_frame = is_main_frame;
   frame_state.is_navigating = true;
   frame_state.is_committed = false;
   frame_state.is_server_redirected = false;
   frame_ids_.insert(frame_id);
 }
 
 void FrameNavigationState::StopTrackingFramesInRVH(
-    content::RenderViewHost* render_view_host) {
+    content::RenderViewHost* render_view_host,
+    FrameID id_to_skip) {
   for (std::set<FrameID>::iterator frame = frame_ids_.begin();
        frame != frame_ids_.end();) {
-    if (frame->render_view_host != render_view_host) {
+    if (frame->render_view_host != render_view_host ||
+        *frame == id_to_skip) {
       ++frame;
       continue;
     }
     FrameID frame_id = *frame;
     ++frame;
     if (frame_id == main_frame_id_)
       main_frame_id_ = FrameID();
     frame_state_map_.erase(frame_id);
     frame_ids_.erase(frame_id);
   }
@@ skipping 55 matching lines @@
 bool FrameNavigationState::GetNavigationCompleted(FrameID frame_id) const {
   FrameIdToStateMap::const_iterator frame_state =
       frame_state_map_.find(frame_id);
   return (frame_state == frame_state_map_.end() ||
           !frame_state->second.is_navigating);
 }
 
 void FrameNavigationState::SetNavigationCommitted(FrameID frame_id) {
   DCHECK(frame_state_map_.find(frame_id) != frame_state_map_.end());
   frame_state_map_[frame_id].is_committed = true;
-  if (frame_state_map_[frame_id].is_main_frame)
+  if (frame_state_map_[frame_id].is_main_frame) {
+    DCHECK_EQ(1u, frame_ids_.size());
     main_frame_id_ = frame_id;
+  }
 }
 
 bool FrameNavigationState::GetNavigationCommitted(FrameID frame_id) const {
   FrameIdToStateMap::const_iterator frame_state =
       frame_state_map_.find(frame_id);
   return (frame_state != frame_state_map_.end() &&
           frame_state->second.is_committed);
 }
 
 void FrameNavigationState::SetIsServerRedirected(FrameID frame_id) {
   DCHECK(frame_state_map_.find(frame_id) != frame_state_map_.end());
   frame_state_map_[frame_id].is_server_redirected = true;
 }
 
 bool FrameNavigationState::GetIsServerRedirected(FrameID frame_id) const {
   FrameIdToStateMap::const_iterator frame_state =
       frame_state_map_.find(frame_id);
   return (frame_state != frame_state_map_.end() &&
           frame_state->second.is_server_redirected);
 }
 
 }  // namespace extensions