PlzNavigate: fix DevToolsProtocolTest.CrossSitePauseInBeforeUnload

content/browser/devtools/render_frame_devtools_agent_host.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.
 
 #ifndef CONTENT_BROWSER_DEVTOOLS_RENDER_FRAME_DEVTOOLS_AGENT_HOST_H_
 #define CONTENT_BROWSER_DEVTOOLS_RENDER_FRAME_DEVTOOLS_AGENT_HOST_H_
 
 #include <map>
 
 #include "base/compiler_specific.h"
@@ skipping 37 matching lines @@
 class CONTENT_EXPORT RenderFrameDevToolsAgentHost
     : public DevToolsAgentHostImpl,
       private WebContentsObserver {
  public:
   static void AddAllAgentHosts(DevToolsAgentHost::List* result);
 
   static void OnCancelPendingNavigation(RenderFrameHost* pending,
                                         RenderFrameHost* current);
   static void OnBeforeNavigation(RenderFrameHost* current,
                                  RenderFrameHost* pending);
+  static void OnBeforeNavigation(NavigationHandle* navigation_handle);

[dgozman, 2016/02/24 19:05:45]

I don't really like this. We hoped to move away from devtools-specific static
methods with PlzNavigate. Why do we need this hack again? Should we adjust
navigation API instead?

[clamy, 2016/02/25 14:24:15]

The content policy is not to add methods to the content public API that are not
used outside of content. This would not be the case here. If we were to
introduce such a method in the future, we could move devtools to using it
though.

 
   void SynchronousSwapCompositorFrame(
       const cc::CompositorFrameMetadata& frame_metadata);
 
   bool HasRenderFrameHost(RenderFrameHost* host);
 
   // DevTooolsAgentHost overrides.
   void DisconnectWebContents() override;
   void ConnectWebContents(WebContents* web_contents) override;
   BrowserContext* GetBrowserContext() override;
@@ skipping 15 matching lines @@
   static void AppendAgentHostForFrameIfApplicable(
       DevToolsAgentHost::List* result,
       RenderFrameHost* host);
 
   // DevToolsAgentHostImpl overrides.
   void Attach() override;
   void Detach() override;
   void InspectElement(int x, int y) override;
 
   // WebContentsObserver overrides.
-  void DidStartNavigation(NavigationHandle* navigation_handle) override;
   void ReadyToCommitNavigation(NavigationHandle* navigation_handle) override;
   void DidFinishNavigation(NavigationHandle* navigation_handle) override;
   void RenderFrameHostChanged(RenderFrameHost* old_host,
                               RenderFrameHost* new_host) override;
   void FrameDeleted(RenderFrameHost* rfh) override;
   void RenderFrameDeleted(RenderFrameHost* rfh) override;
   void RenderProcessGone(base::TerminationStatus status) override;
   bool OnMessageReceived(const IPC::Message& message,
                          RenderFrameHost* render_frame_host) override;
   bool OnMessageReceived(const IPC::Message& message) override;
   void DidAttachInterstitialPage() override;
   void DidDetachInterstitialPage() override;
   void DidCommitProvisionalLoadForFrame(
       RenderFrameHost* render_frame_host,
       const GURL& url,
       ui::PageTransition transition_type) override;
   void DidFailProvisionalLoad(
       RenderFrameHost* render_frame_host,
       const GURL& validated_url,
       int error_code,
       const base::string16& error_description,
       bool was_ignored_by_handler) override;
 
   void AboutToNavigateRenderFrame(RenderFrameHost* old_host,
                                   RenderFrameHost* new_host);
+  void WillStartRequest(NavigationHandle* navigation_handle);

[dgozman, 2016/02/24 19:05:45]

This is a strange name. Perhaps, |AboutToNavigate| will be better?

[clamy, 2016/02/25 14:24:15]

Done.

 
   void DispatchBufferedProtocolMessagesIfNecessary();
 
   void SetPending(RenderFrameHostImpl* host);
   void CommitPending();
   void DiscardPending();
   void UpdateProtocolHandlers(RenderFrameHostImpl* host);
 
   bool IsChildFrame();
 
   void OnClientAttached();
   void OnClientDetached();
 
   void RenderFrameCrashed();
   void OnSwapCompositorFrame(const IPC::Message& message);
   void OnDispatchOnInspectorFrontend(
       RenderFrameHost* sender,
       const DevToolsMessageChunk& message);
   void OnRequestNewWindow(RenderFrameHost* sender, int new_routing_id);
   void DestroyOnRenderFrameGone();
 
-  bool MatchesMyTreeNode(NavigationHandle* navigation_handle);
-
   class FrameHostHolder;
 
   scoped_ptr<FrameHostHolder> current_;
   scoped_ptr<FrameHostHolder> pending_;
 
   // Stores per-host state between DisconnectWebContents and ConnectWebContents.
   scoped_ptr<FrameHostHolder> disconnected_;
 
   scoped_ptr<devtools::dom::DOMHandler> dom_handler_;
   scoped_ptr<devtools::input::InputHandler> input_handler_;
@@ skipping 11 matching lines @@
   scoped_ptr<PowerSaveBlockerImpl> power_save_blocker_;
 #endif
   scoped_ptr<DevToolsProtocolHandler> protocol_handler_;
   bool current_frame_crashed_;
 
   // PlzNavigate
 
   // Handle that caused the setting of pending_.
   NavigationHandle* pending_handle_;
 
-  // Navigation counter and queue for buffering protocol messages during a
-  // navigation.
-  int in_navigation_;
+  // List of handles currently navigating.
+  std::set<NavigationHandle*> navigating_handles_;
 
   // <call_id> -> <session_id, message>
   std::map<int, std::pair<int, std::string>>
       in_navigation_protocol_message_buffer_;
 
   // The FrameTreeNode associated with this agent.
   FrameTreeNode* frame_tree_node_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameDevToolsAgentHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DEVTOOLS_RENDER_FRAME_DEVTOOLS_AGENT_HOST_H_