Convert TestNavigationObserver to use the new navigation callbacks.

content/public/test/test_navigation_observer.h

Index: content/public/test/test_navigation_observer.h
diff --git a/content/public/test/test_navigation_observer.h b/content/public/test/test_navigation_observer.h
index 93091ca64c7c8aeb893620ce940dfc8accac0672..241e569421cd4b505547c760612e8b421fab1f6c 100644
--- a/content/public/test/test_navigation_observer.h
+++ b/content/public/test/test_navigation_observer.h
@@ -9,16 +9,12 @@
 #include <set>
 
 #include "base/callback.h"
-#include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "content/public/test/test_utils.h"
-#include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 
 namespace content {
-class RenderFrameHost;
 class WebContents;
-struct LoadCommittedDetails;
 
 // For browser_tests, which run on the UI thread, run a second
 // MessageLoop and quit when the navigation completes loading.
@@ -63,16 +59,8 @@ class TestNavigationObserver {
   void OnDidAttachInterstitialPage(WebContents* web_contents);
   void OnDidStartLoading(WebContents* web_contents);
   void OnDidStopLoading(WebContents* web_contents);
-  void OnDidStartProvisionalLoad(RenderFrameHost* render_frame_host,
-                                 const GURL& validated_url,
-                                 bool is_error_page);
-  void OnDidFailProvisionalLoad(RenderFrameHost* render_frame_host,
-                                const GURL& validated_url,
-                                int error_code,
-                                const base::string16& error_description);
-  void OnDidCommitProvisionalLoadForFrame(RenderFrameHost* render_frame_host,
-                                          const GURL& url,
-                                          ui::PageTransition transition_type);
+  void OnDidStartNavigation();
+  void OnDidFinishNavigation(bool is_error_page, const GURL& url);
 
   // If true the navigation has started.
   bool navigation_started_;