Really ignore events for replacement content in the webnavigation api

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 305 matching lines @@
         FrameNavigationState::FrameID frame_id(
             resource_redirect_details->frame_id, render_view_host);
         navigation_state_.SetIsServerRedirected(frame_id);
       }
       break;
     }
 
     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_)
+      if (render_view_host == render_view_host_) {
         render_view_host_ = NULL;
-      else if (render_view_host == pending_render_view_host_)
+        if (pending_render_view_host_) {
+          SendErrorEvents(web_contents(),
+                          pending_render_view_host_,
+                          FrameNavigationState::FrameID());
+          pending_render_view_host_ = NULL;
+        }
+      } else if (render_view_host == pending_render_view_host_) {
         pending_render_view_host_ = NULL;
-      else
+      } else {
         return;
+      }
       SendErrorEvents(
           web_contents(), render_view_host, FrameNavigationState::FrameID());
       break;
     }
 
     default:
       NOTREACHED();
   }
 }
 
@@ skipping 157 matching lines @@
 }
 
 void WebNavigationTabObserver::DidFinishLoad(
     int64 frame_num,
     const GURL& validated_url,
     bool is_main_frame,
     content::RenderViewHost* render_view_host) {
   if (render_view_host != render_view_host_)
     return;
   FrameNavigationState::FrameID frame_id(frame_num, render_view_host);
+  // When showing replacement content, we might get load signals for frames
+  // that weren't reguarly loaded.
+  if (!navigation_state_.IsValidFrame(frame_id))
+    return;
   navigation_state_.SetNavigationCompleted(frame_id);
   if (!navigation_state_.CanSendEvents(frame_id))
     return;
   DCHECK_EQ(navigation_state_.GetUrl(frame_id), validated_url);
   DCHECK_EQ(navigation_state_.IsMainFrame(frame_id), is_main_frame);
   helpers::DispatchOnCompleted(web_contents(),
                                validated_url,
                                is_main_frame,
                                frame_num);
 }
 
 void WebNavigationTabObserver::DidFailLoad(
     int64 frame_num,
     const GURL& validated_url,
     bool is_main_frame,
     int error_code,
     const string16& error_description,
     content::RenderViewHost* render_view_host) {
   if (render_view_host != render_view_host_)
     return;
   FrameNavigationState::FrameID frame_id(frame_num, render_view_host);
-  // A navigation might fail before we even started a provisional load.
+  // When showing replacement content, we might get load signals for frames
+  // that weren't reguarly loaded.
   if (!navigation_state_.IsValidFrame(frame_id))
     return;
   if (navigation_state_.CanSendEvents(frame_id)) {
     helpers::DispatchOnErrorOccurred(
         web_contents(), render_view_host->GetProcess()->GetID(), validated_url,
         frame_num, is_main_frame, error_code);
   }
   navigation_state_.SetErrorOccurredInFrame(frame_id);
 }
 
@@ skipping 163 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