PlzNavigate: Fix ordering of onBeforeNavigate and onCreatedNavigationTarget.

chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.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_helpers.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/json/json_writer.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
+#include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_constants.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/web_navigation.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.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 "content/public/common/url_constants.h"
@@ skipping 28 matching lines @@
   EventRouter* event_router = EventRouter::Get(profile);
   if (profile && event_router) {
     event->restrict_to_browser_context = profile;
     event->filter_info = info;
     event_router->BroadcastEvent(std::move(event));
   }
 }
 
 }  // namespace
 
-// Constructs and dispatches an onBeforeNavigate event.
-void DispatchOnBeforeNavigate(content::NavigationHandle* navigation_handle) {
+// Constructs an onBeforeNavigate event.
+std::unique_ptr<Event> CreateOnBeforeNavigateEvent(
+    content::NavigationHandle* navigation_handle) {
   GURL url(navigation_handle->GetURL());
   if (navigation_handle->IsSrcdoc())
     url = GURL(content::kAboutSrcDocURL);
 
   web_navigation::OnBeforeNavigate::Details details;
   details.tab_id =
       ExtensionTabUtil::GetTabId(navigation_handle->GetWebContents());
   details.url = url.spec();
   details.process_id = -1;
   details.frame_id = ExtensionApiFrameIdMap::GetFrameId(navigation_handle);
   details.parent_frame_id =
       ExtensionApiFrameIdMap::GetParentFrameId(navigation_handle);
   details.time_stamp = MilliSecondsFromTime(base::Time::Now());
 
   std::unique_ptr<Event> event(
       new Event(events::WEB_NAVIGATION_ON_BEFORE_NAVIGATE,
                 web_navigation::OnBeforeNavigate::kEventName,
                 web_navigation::OnBeforeNavigate::Create(details)));
-  DispatchEvent(navigation_handle->GetWebContents()->GetBrowserContext(),
-                std::move(event), url);
+
+  EventFilteringInfo info;
+  info.SetURL(navigation_handle->GetURL());
+
+  Profile* profile = Profile::FromBrowserContext(
+      navigation_handle->GetWebContents()->GetBrowserContext());
+  if (profile) {
+    event->restrict_to_browser_context = profile;

[Devlin, 2016/12/02 21:58:31]

Just use browser context directly.

[nasko, 2016/12/02 23:41:39]

Done.

+    event->filter_info = info;
+  }
+
+  return event;
 }
 
 // Constructs and dispatches an onCommitted or onReferenceFragmentUpdated
 // event.
 void DispatchOnCommitted(events::HistogramValue histogram_value,
                          const std::string& event_name,
                          content::NavigationHandle* navigation_handle) {
   content::WebContents* web_contents = navigation_handle->GetWebContents();
   GURL url(navigation_handle->GetURL());
   content::RenderFrameHost* frame_host =
@@ skipping 100 matching lines @@
       ExtensionApiFrameIdMap::GetFrameId(source_frame_host);
   details.url = target_url.possibly_invalid_spec();
   details.tab_id = ExtensionTabUtil::GetTabId(target_web_contents);
   details.time_stamp = MilliSecondsFromTime(base::Time::Now());
 
   std::unique_ptr<Event> event(
       new Event(events::WEB_NAVIGATION_ON_CREATED_NAVIGATION_TARGET,
                 web_navigation::OnCreatedNavigationTarget::kEventName,
                 web_navigation::OnCreatedNavigationTarget::Create(details)));
   DispatchEvent(browser_context, std::move(event), target_url);
+
+  // If the target WebContents already received the onBeforeNavigate event,
+  // send it immediately after the onCreatedNavigationTarget above.
+  WebNavigationTabObserver* target_observer =
+      WebNavigationTabObserver::Get(target_web_contents);
+  target_observer->DispatchCachedOnBeforeNavigate();
 }
 
 // Constructs and dispatches an onErrorOccurred event.
 void DispatchOnErrorOccurred(content::WebContents* web_contents,
                              content::RenderFrameHost* frame_host,
                              const GURL& url,
                              int error_code) {
   web_navigation::OnErrorOccurred::Details details;
   details.tab_id = ExtensionTabUtil::GetTabId(web_contents);
   details.url = url.spec();
@@ skipping 42 matching lines @@
   std::unique_ptr<Event> event(
       new Event(events::WEB_NAVIGATION_ON_TAB_REPLACED,
                 web_navigation::OnTabReplaced::kEventName,
                 web_navigation::OnTabReplaced::Create(details)));
   DispatchEvent(browser_context, std::move(event), GURL());
 }
 
 }  // namespace web_navigation_api_helpers
 
 }  // namespace extensions