Convert NavigationMetricsRecorder to use the new navigation callbacks.

chrome/browser/tab_contents/navigation_metrics_recorder.cc

Index: chrome/browser/tab_contents/navigation_metrics_recorder.cc
diff --git a/chrome/browser/tab_contents/navigation_metrics_recorder.cc b/chrome/browser/tab_contents/navigation_metrics_recorder.cc
index d003129b26a8970349f9fbfb7753acc8be2edc18..ca59f61b38c7d1d717456a546c9ffc96b9b7c178 100644
--- a/chrome/browser/tab_contents/navigation_metrics_recorder.cc
+++ b/chrome/browser/tab_contents/navigation_metrics_recorder.cc
@@ -14,8 +14,8 @@
 #include "components/rappor/rappor_service_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
@@ -70,35 +70,39 @@ void NavigationMetricsRecorder::set_rappor_service_for_testing(
   rappor_service_ = service;
 }
 
-void NavigationMetricsRecorder::DidNavigateMainFrame(
-      const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) {
+void NavigationMetricsRecorder::DidFinishNavigation(
+    content::NavigationHandle* navigation_handle) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  if (!navigation_handle->IsInMainFrame() || !navigation_handle->HasCommitted())
+    return;
 
   content::BrowserContext* context = web_contents()->GetBrowserContext();
   navigation_metrics::OriginsSeenService* service =
       OriginsSeenServiceFactory::GetForBrowserContext(context);
-  const url::Origin origin(details.entry->GetVirtualURL());
+  content::NavigationEntry* last_committed =

[nasko, 2017/02/06 17:28:38]

nit: last_committed_entry

[jam, 2017/02/06 18:06:00]

Done.

+      web_contents()->GetController().GetLastCommittedEntry();
+  const url::Origin origin(last_committed->GetVirtualURL());
   bool have_already_seen_origin = service->Insert(origin);
 
   navigation_metrics::RecordMainFrameNavigation(
-      details.entry->GetVirtualURL(), details.is_in_page,
+      last_committed->GetVirtualURL(), navigation_handle->IsSamePage(),
       context->IsOffTheRecord(), have_already_seen_origin);
 
   // Record the domain and registry of the URL that resulted in a navigation to
   // a |data:| URL, either by redirects or user clicking a link.
-  if (details.entry->GetVirtualURL().SchemeIs(url::kDataScheme) &&
-      !ui::PageTransitionCoreTypeIs(params.transition,
+  if (last_committed->GetVirtualURL().SchemeIs(url::kDataScheme) &&

[nasko, 2017/02/06 17:28:38]

Huh, I wonder why the virtual URL is used here? I'll make a note to follow up,
since it is not related to this CL at all.

+      !ui::PageTransitionCoreTypeIs(navigation_handle->GetPageTransition(),
                                     ui::PAGE_TRANSITION_TYPED)) {
-    if (!details.previous_url.is_empty()) {
+    if (!navigation_handle->GetPreviousURL().is_empty()) {
       rappor::SampleDomainAndRegistryFromGURL(
-          rappor_service_, "Navigation.Scheme.Data", details.previous_url);
+          rappor_service_, "Navigation.Scheme.Data",
+          navigation_handle->GetPreviousURL());
     }
 
     // Also record the mime type of the data: URL.
     std::string mime_type;
     std::string charset;
-    if (net::DataURL::Parse(details.entry->GetVirtualURL(), &mime_type,
+    if (net::DataURL::Parse(last_committed->GetVirtualURL(), &mime_type,
                             &charset, nullptr)) {
       RecordDataURLMimeType(mime_type);
     }