Convert NavigationController unit and browser tests to use the new navigation callbacks.

content/browser/frame_host/navigation_handle_impl.h

Index: content/browser/frame_host/navigation_handle_impl.h
diff --git a/content/browser/frame_host/navigation_handle_impl.h b/content/browser/frame_host/navigation_handle_impl.h
index 74b629e6f67bcbf531b4b8024fefac27089dbe63..3a460592222cbb92be3cf6bd10c8fc36d129ff6e 100644
--- a/content/browser/frame_host/navigation_handle_impl.h
+++ b/content/browser/frame_host/navigation_handle_impl.h
@@ -24,6 +24,7 @@
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/navigation_data.h"
 #include "content/public/browser/navigation_throttle.h"
+#include "content/public/browser/navigation_type.h"
 #include "content/public/browser/ssl_status.h"
 #include "content/public/common/request_context_type.h"
 #include "third_party/WebKit/public/platform/WebMixedContentContextType.h"
@@ -289,6 +290,7 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
       const FrameHostMsg_DidCommitProvisionalLoad_Params& params,
       bool did_replace_entry,
       const GURL& previous_url,
+      NavigationType navigation_type,
       RenderFrameHostImpl* render_frame_host);
 
   // Called during commit. Takes ownership of the embedder's NavigationData
@@ -314,6 +316,11 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
     searchable_form_encoding_ = encoding;
   }
 
+  NavigationType navigation_type() {
+    DCHECK_GE(state_, DID_COMMIT);
+    return navigation_type_;
+  }
+
   void set_response_headers_for_testing(
       scoped_refptr<net::HttpResponseHeaders> response_headers) {
     response_headers_ = response_headers;
@@ -481,6 +488,7 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
   GURL previous_url_;
   GURL base_url_;
   net::HostPortPair socket_address_;
+  NavigationType navigation_type_;
 
   base::WeakPtrFactory<NavigationHandleImpl> weak_factory_;