Send the correct process ID with webNavigation events

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"
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/retargeting_details.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/view_type_utils.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/api/web_navigation.h"
 #include "content/public/browser/resource_request_details.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
+#include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/net_errors.h"
 
 namespace GetFrame = extensions::api::web_navigation::GetFrame;
 namespace GetAllFrames = extensions::api::web_navigation::GetAllFrames;
 
 namespace extensions {
 
 namespace helpers = web_navigation_api_helpers;
@@ skipping 260 matching lines @@
     bool is_main_frame,
     const GURL& validated_url,
     bool is_error_page,
     content::RenderViewHost* render_view_host) {
   if (!render_view_host_)
     render_view_host_ = render_view_host;
   if (render_view_host != render_view_host_ &&
       render_view_host != pending_render_view_host_)
     return;
 
-  // TODO(jochen): Remove this hack once we properly include the process ID in
-  // the events.
-  // Ignore navigations of sub frames, if the main frame isn't committed yet.
-  // This might happen if a sub frame triggers a navigation for both the main
-  // frame and itself. Since the sub frame is about to be deleted, and there's
-  // no way for an extension to tell that these navigations belong to an old
-  // frame, we just suppress the events here.
-  int64 main_frame_id = navigation_state_.GetMainFrameID();
-  if (!is_main_frame &&
-      !navigation_state_.GetNavigationCommitted(main_frame_id)) {
-    return;
-  }
-
   navigation_state_.TrackFrame(frame_id,
                                validated_url,
                                is_main_frame,
                                is_error_page);
   if (!navigation_state_.CanSendEvents(frame_id))
     return;
 
   helpers::DispatchOnBeforeNavigate(
-      web_contents(), frame_id, is_main_frame, validated_url);
+      web_contents(), render_view_host->GetProcess()->GetID(), frame_id,
+      is_main_frame, validated_url);
 }
 
 void WebNavigationTabObserver::DidCommitProvisionalLoadForFrame(
     int64 frame_id,
     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_)
@@ skipping 62 matching lines @@
       render_view_host != pending_render_view_host_)
     return;
   if (render_view_host == pending_render_view_host_)
     pending_render_view_host_ = NULL;
 
   if (!navigation_state_.CanSendEvents(frame_id))
     return;
 
   navigation_state_.SetErrorOccurredInFrame(frame_id);
   helpers::DispatchOnErrorOccurred(
-      web_contents(), validated_url, frame_id, is_main_frame, error_code);
+      web_contents(), render_view_host->GetProcess()->GetID(), validated_url,
+      frame_id, is_main_frame, error_code);
 }
 
 void WebNavigationTabObserver::DocumentLoadedInFrame(
     int64 frame_id,
     content::RenderViewHost* render_view_host) {
   if (render_view_host != render_view_host_)
     return;
   if (!navigation_state_.CanSendEvents(frame_id))
     return;
   helpers::DispatchOnDOMContentLoaded(web_contents(),
@@ skipping 26 matching lines @@
     bool is_main_frame,
     int error_code,
     const string16& error_description,
     content::RenderViewHost* render_view_host) {
   if (render_view_host != render_view_host_)
     return;
   if (!navigation_state_.CanSendEvents(frame_id))
     return;
   navigation_state_.SetErrorOccurredInFrame(frame_id);
   helpers::DispatchOnErrorOccurred(
-      web_contents(), validated_url, frame_id, is_main_frame, error_code);
+      web_contents(), render_view_host->GetProcess()->GetID(), validated_url,
+      frame_id, is_main_frame, error_code);
 }
 
 void WebNavigationTabObserver::DidOpenRequestedURL(
     content::WebContents* new_contents,
     const GURL& url,
     const content::Referrer& referrer,
     WindowOpenDisposition disposition,
     content::PageTransition transition,
     int64 source_frame_id) {
   if (!navigation_state_.CanSendEvents(source_frame_id))
@@ skipping 19 matching lines @@
 }
 
 void WebNavigationTabObserver::WebContentsDestroyed(content::WebContents* tab) {
   g_tab_observer.Get().erase(tab);
   for (FrameNavigationState::const_iterator frame = navigation_state_.begin();
        frame != navigation_state_.end(); ++frame) {
     if (!navigation_state_.GetNavigationCompleted(*frame) &&
         navigation_state_.CanSendEvents(*frame)) {
       helpers::DispatchOnErrorOccurred(
         tab,
+        tab->GetRenderViewHost()->GetProcess()->GetID(),
         navigation_state_.GetUrl(*frame),
         *frame,
         navigation_state_.IsMainFrame(*frame),
         net::ERR_ABORTED);
     }
   }
 }
 
 // See also NavigationController::IsURLInPageNavigation.
 bool WebNavigationTabObserver::IsReferenceFragmentNavigation(
@@ skipping 92 matching lines @@
     frame->frame_id = helpers::GetFrameId(
         navigation_state.IsMainFrame(frame_id), frame_id);
     frame->error_occurred = navigation_state.GetErrorOccurredInFrame(frame_id);
     result_list.push_back(frame);
   }
   results_ = GetAllFrames::Results::Create(result_list);
   return true;
 }
 
 }  // namespace extensions