RenderFrameDevToolsAgentHost uses new navigation observer API.

content/browser/devtools/render_frame_devtools_agent_host.h

Index: content/browser/devtools/render_frame_devtools_agent_host.h
diff --git a/content/browser/devtools/render_frame_devtools_agent_host.h b/content/browser/devtools/render_frame_devtools_agent_host.h
index dec2ba7c39fe8b475f2a66b0e698b114bcf16e36..e6f6d5572d7e3c6f48587f3e3102ce735358275f 100644
--- a/content/browser/devtools/render_frame_devtools_agent_host.h
+++ b/content/browser/devtools/render_frame_devtools_agent_host.h
@@ -23,6 +23,8 @@ namespace content {
 class BrowserContext;
 class DevToolsFrameTraceRecorder;
 class DevToolsProtocolHandler;
+class FrameTreeNode;
+class NavigationHandle;
 class RenderFrameHostImpl;
 
 #if defined(OS_ANDROID)
@@ -87,8 +89,9 @@ class CONTENT_EXPORT RenderFrameDevToolsAgentHost
   void InspectElement(int x, int y) override;
 
   // WebContentsObserver overrides.
-  void RenderFrameHostChanged(RenderFrameHost* old_host,
-                              RenderFrameHost* new_host) 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;
@@ -97,16 +100,6 @@ class CONTENT_EXPORT RenderFrameDevToolsAgentHost
   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);
@@ -125,6 +118,9 @@ class CONTENT_EXPORT RenderFrameDevToolsAgentHost
   void OnSwapCompositorFrame(const IPC::Message& message);
   void DestroyOnRenderFrameGone();
 
+  bool MatchesMyTreeNode(NavigationHandle* navigation_handle);
+  bool MatchesMyTreeNode(RenderFrameHost* render_frame_host);
+
   class FrameHostHolder;
 
   scoped_ptr<FrameHostHolder> current_;
@@ -150,6 +146,9 @@ class CONTENT_EXPORT RenderFrameDevToolsAgentHost
   scoped_ptr<DevToolsProtocolHandler> protocol_handler_;
   bool current_frame_crashed_;
 
+  // The FrameTreeNode this agent is associated with.
+  FrameTreeNode* frame_tree_node_;
+
   DISALLOW_COPY_AND_ASSIGN(RenderFrameDevToolsAgentHost);
 };