PlzNavigate: Fix ordering of onBeforeNavigate and onCreatedNavigationTarget.

chrome/browser/extensions/api/web_navigation/web_navigation_api.h

 // 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.
 
 // Defines the Chrome Extensions WebNavigation API functions for observing and
 // intercepting navigation events, as specified in the extension JSON API.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_WEB_NAVIGATION_WEB_NAVIGATION_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_WEB_NAVIGATION_WEB_NAVIGATION_API_H_
 
@@ skipping 53 matching lines @@
                    const base::string16& error_description,
                    bool was_ignored_by_handler) override;
   void DidOpenRequestedURL(content::WebContents* new_contents,
                            content::RenderFrameHost* source_render_frame_host,
                            const GURL& url,
                            const content::Referrer& referrer,
                            WindowOpenDisposition disposition,
                            ui::PageTransition transition) override;
   void WebContentsDestroyed() override;
 
+  // This method dispatches the already created onBeforeNavigate event.
+  void DispatchOnBeforeNavigate();

[Devlin, 2016/12/02 20:17:11]

nit: Can we rename this to be DispatchPendingOnBeforeNavigate(),
DispatchCached..., Dispatch...IfPending, etc, to make it clear from call sites
that this conditionally does it only if we have one stored, rather than
unconditionally sending a new event?

[nasko, 2016/12/02 21:40:45]

Acknowledged.

+
  private:
   explicit WebNavigationTabObserver(content::WebContents* web_contents);
   friend class content::WebContentsUserData<WebNavigationTabObserver>;
 
   void HandleCommit(content::NavigationHandle* navigation_handle);
   void HandleError(content::NavigationHandle* navigation_handle);
 
   // True if the transition and target url correspond to a reference fragment
   // navigation.
   bool IsReferenceFragmentNavigation(content::RenderFrameHost* frame_host,
                                      const GURL& url);
 
   // Creates and sends onErrorOccurred events for all on-going navigations. If
   // |render_view_host| is non-NULL, only generates events for frames in this
   // render view host. If |frame_host_to_skip| is given, no events are sent for
   // that
   // frame.
   void SendErrorEvents(content::WebContents* web_contents,
                        content::RenderViewHost* render_view_host,
                        content::RenderFrameHost* frame_host_to_skip);
 
   // Tracks the state of the frames we are sending events for.
   FrameNavigationState navigation_state_;
 
+  // The latest onBeforeNavigate event this frame has generated. It is stored
+  // as it might not be sent immediately, but delayed until the tab is added to
+  // the tab strip and is ready to dispatch events.
+  std::unique_ptr<Event> pending_on_before_navigate_event_;
+
   // Used for tracking registrations to redirect notifications.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNavigationTabObserver);
 };
 
 // Observes navigation notifications and routes them as events to the extension
 // system.
 class WebNavigationEventRouter : public TabStripModelObserver,
                                  public BrowserTabStripTrackerDelegate,
@@ skipping 103 matching lines @@
 
   // Created lazily upon OnListenerAdded.
   std::unique_ptr<WebNavigationEventRouter> web_navigation_event_router_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNavigationAPI);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_WEB_NAVIGATION_WEB_NAVIGATION_API_H_