Convert RenderFrameDevToolsAgentHost to use the new navigation callbacks.

content/browser/devtools/render_frame_devtools_agent_host.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.
 
 #include "content/browser/devtools/render_frame_devtools_agent_host.h"
 
 #include <tuple>
 #include <utility>
 
 #include "base/guid.h"
@@ skipping 25 matching lines @@
 #include "content/browser/frame_host/navigation_handle_impl.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/renderer_host/input/input_router_impl.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/content_browser_client.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_widget_host_iterator.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 
 #if defined(OS_ANDROID)
 #include "content/public/browser/render_widget_host_view.h"
 #include "device/power_save_blocker/power_save_blocker.h"
 #endif
 
 namespace content {
@@ skipping 573 matching lines @@
     }
   }
   DCHECK(CheckConsistency());
 }
 
 void RenderFrameDevToolsAgentHost::DidFinishNavigation(
     NavigationHandle* navigation_handle) {
   // CommitPending may destruct |this|.
   scoped_refptr<RenderFrameDevToolsAgentHost> protect(this);
 
-  if (!IsBrowserSideNavigationEnabled())
+  if (!IsBrowserSideNavigationEnabled()) {
+    if (navigation_handle->IsErrorPage()) {
+      if (pending_ &&
+          pending_->host() == navigation_handle->GetRenderFrameHost()) {
+        DiscardPending();
+      }
+    } else if (navigation_handle->HasCommitted()) {
+      if (pending_ &&
+          pending_->host() == navigation_handle->GetRenderFrameHost()) {
+        CommitPending();
+      }
+      if (session())
+        protocol::TargetHandler::FromSession(session())->UpdateServiceWorkers();
+    }
+    DCHECK(CheckConsistency());
     return;
+  }
 
   // If the navigation is not tracked, return;
   if (navigating_handles_.count(navigation_handle) == 0)
     return;
 
   // Now that the navigation is finished, remove the handle from the list of
   // navigating handles.
   navigating_handles_.erase(navigation_handle);
 
   if (pending_handle_ == navigation_handle) {
@@ skipping 214 matching lines @@
   DCHECK(CheckConsistency());
 }
 
 void RenderFrameDevToolsAgentHost::DidDetachInterstitialPage() {
   protocol::PageHandler* page_handler =
       session() ? protocol::PageHandler::FromSession(session()) : nullptr;
   if (page_handler)
     page_handler->DidDetachInterstitialPage();
 }
 
-void RenderFrameDevToolsAgentHost::DidCommitProvisionalLoadForFrame(
-    RenderFrameHost* render_frame_host,
-    const GURL& url,
-    ui::PageTransition transition_type) {
-  // CommitPending may destruct |this|.
-  scoped_refptr<RenderFrameDevToolsAgentHost> protect(this);
-
-  if (IsBrowserSideNavigationEnabled())
-    return;
-  if (pending_ && pending_->host() == render_frame_host)
-    CommitPending();
-  DCHECK(CheckConsistency());
-  if (session())
-    protocol::TargetHandler::FromSession(session())->UpdateServiceWorkers();
-}
-
-void RenderFrameDevToolsAgentHost::DidFailProvisionalLoad(
-    RenderFrameHost* render_frame_host,
-    const GURL& validated_url,
-    int error_code,
-    const base::string16& error_description,
-    bool was_ignored_by_handler) {
-  if (IsBrowserSideNavigationEnabled())
-    return;
-  if (pending_ && pending_->host() == render_frame_host)
-    DiscardPending();
-  DCHECK(CheckConsistency());
-}
-
 void RenderFrameDevToolsAgentHost::WasShown() {
   CreatePowerSaveBlocker();
 }
 
 void RenderFrameDevToolsAgentHost::WasHidden() {
 #if defined(OS_ANDROID)
   power_save_blocker_.reset();
 #endif
 }
 
@@ skipping 251 matching lines @@
     RenderFrameHost* host) {
   return (current_ && current_->host() == host) ||
       (pending_ && pending_->host() == host);
 }
 
 bool RenderFrameDevToolsAgentHost::IsChildFrame() {
   return current_ && current_->host()->GetParent();
 }
 
 }  // namespace content