Convert TestNavigationObserver to use the new navigation callbacks.

content/public/test/test_navigation_observer.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/public/test/test_navigation_observer.h"
 
 #include "base/bind.h"
-#include "base/macros.h"
-#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
-#include "base/run_loop.h"
 #include "content/browser/web_contents/web_contents_impl.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/web_contents_observer.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 class TestNavigationObserver::TestWebContentsObserver
     : public WebContentsObserver {
  public:
   TestWebContentsObserver(TestNavigationObserver* parent,
                           WebContents* web_contents)
       : WebContentsObserver(web_contents),
         parent_(parent) {
@@ skipping 15 matching lines @@
   }
 
   void DidStartLoading() override {
     parent_->OnDidStartLoading(web_contents());
   }
 
   void DidStopLoading() override {
     parent_->OnDidStopLoading(web_contents());
   }
 
-  void DidStartProvisionalLoadForFrame(RenderFrameHost* render_frame_host,
-                                       const GURL& validated_url,
-                                       bool is_error_page) override {
-    parent_->OnDidStartProvisionalLoad(render_frame_host, validated_url,
-                                       is_error_page);
+  void DidStartNavigation(NavigationHandle* navigation_handle) override {
+    if (navigation_handle->IsSamePage())
+      return;
+
+    parent_->OnDidStartNavigation();
   }
 
-  void DidFailProvisionalLoad(
-      RenderFrameHost* render_frame_host,
-      const GURL& validated_url,
-      int error_code,
-      const base::string16& error_description,
-      bool was_ignored_by_handler) override {
-    parent_->OnDidFailProvisionalLoad(render_frame_host, validated_url,
-                                      error_code, error_description);
-  }
+  void DidFinishNavigation(NavigationHandle* navigation_handle) override {
+    if (!navigation_handle->HasCommitted())
+      return;
 
-  void DidCommitProvisionalLoadForFrame(
-      RenderFrameHost* render_frame_host,
-      const GURL& url,
-      ui::PageTransition transition_type) override {
-    parent_->OnDidCommitProvisionalLoadForFrame(
-        render_frame_host, url, transition_type);
+    parent_->OnDidFinishNavigation(navigation_handle->IsErrorPage(),
+                                   navigation_handle->GetURL());
   }
 
   TestNavigationObserver* parent_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWebContentsObserver);
 };
 
 TestNavigationObserver::TestNavigationObserver(
     WebContents* web_contents,
     int number_of_navigations)
@@ skipping 82 matching lines @@
   if (!navigation_started_)
     return;
 
   ++navigations_completed_;
   if (navigations_completed_ == number_of_navigations_) {
     navigation_started_ = false;
     message_loop_runner_->Quit();
   }
 }
 
-void TestNavigationObserver::OnDidStartProvisionalLoad(
-    RenderFrameHost* render_frame_host,
-    const GURL& validated_url,
-    bool is_error_page) {
+void TestNavigationObserver::OnDidStartNavigation() {
   last_navigation_succeeded_ = false;
 }
 
-void TestNavigationObserver::OnDidFailProvisionalLoad(
-    RenderFrameHost* render_frame_host,
-    const GURL& validated_url,
-    int error_code,
-    const base::string16& error_description) {
-  last_navigation_url_ = validated_url;
-  last_navigation_succeeded_ = false;
-}
-
-void TestNavigationObserver::OnDidCommitProvisionalLoadForFrame(
-    RenderFrameHost* render_frame_host,
-    const GURL& url,
-    ui::PageTransition transition_type) {
+void TestNavigationObserver::OnDidFinishNavigation(bool is_error_page,
+                                                   const GURL& url) {
   last_navigation_url_ = url;
-  last_navigation_succeeded_ = true;
+  last_navigation_succeeded_ = !is_error_page;
 }
 
 }  // namespace content