Convert NavigationControllerBrowserTest to use the new navigation callbacks.

content/browser/frame_host/navigation_controller_impl_browsertest.cc

Index: content/browser/frame_host/navigation_controller_impl_browsertest.cc
diff --git a/content/browser/frame_host/navigation_controller_impl_browsertest.cc b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
index c6bcc56ae13897c74abfefa77f5f107bd5f48b00..e9952e5725d1201136c2325009becd887a0cafa5 100644
--- a/content/browser/frame_host/navigation_controller_impl_browsertest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
@@ -4702,25 +4702,11 @@ class FailureWatcher : public WebContentsObserver {
     message_loop_runner_->Quit();
   }
 
-  void DidFailProvisionalLoad(
-      RenderFrameHost* render_frame_host,
-      const GURL& validated_url,
-      int error_code,
-      const base::string16& error_description,
-      bool was_ignored_by_handler) override {
-    RenderFrameHostImpl* rfh =
-        static_cast<RenderFrameHostImpl*>(render_frame_host);
-    if (rfh->frame_tree_node()->frame_tree_node_id() != frame_tree_node_id_)
-      return;
-
-    message_loop_runner_->Quit();
-  }
-
   void DidFinishNavigation(NavigationHandle* handle) override {
-    if (handle->GetFrameTreeNodeId() != frame_tree_node_id_)
-      return;
-    if (handle->HasCommitted())
+    if (handle->HasCommitted() ||
+        handle->GetFrameTreeNodeId() != frame_tree_node_id_) {
       return;
+    }
 
     message_loop_runner_->Quit();
   }