Convert NavigationTracingObserver to use the new navigation callbacks.

chrome/browser/tracing/navigation_tracing.cc

Index: chrome/browser/tracing/navigation_tracing.cc
diff --git a/chrome/browser/tracing/navigation_tracing.cc b/chrome/browser/tracing/navigation_tracing.cc
index e5c7332abe91b4b9ead83dd5fc91af70c5faf795..510b6e9df5feaa8f4c95b5957e31a427f1ee37af 100644
--- a/chrome/browser/tracing/navigation_tracing.cc
+++ b/chrome/browser/tracing/navigation_tracing.cc
@@ -15,6 +15,7 @@
 #include "content/public/browser/background_tracing_config.h"
 #include "content/public/browser/background_tracing_manager.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(tracing::NavigationTracingObserver);
@@ -101,8 +102,8 @@ bool NavigationTracingObserver::IsEnabled() {
 NavigationTracingObserver::NavigationTracingObserver(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents) {
-  if (navigation_handle == -1) {
-    navigation_handle =
+  if (navigation_trigger_handle_ == -1) {
+    navigation_trigger_handle_ =
         content::BackgroundTracingManager::GetInstance()->RegisterTriggerType(
             kNavigationTracingConfig);
   }
@@ -111,18 +112,16 @@ NavigationTracingObserver::NavigationTracingObserver(
 NavigationTracingObserver::~NavigationTracingObserver() {
 }
 
-void NavigationTracingObserver::DidStartProvisionalLoadForFrame(
-    content::RenderFrameHost* render_frame_host,
-    const GURL& validated_url,
-    bool is_error_page) {
-  if (!render_frame_host->GetParent() && !is_error_page) {
+void NavigationTracingObserver::DidStartNavigation(
+    content::NavigationHandle* navigation_handle) {
+  if (navigation_handle->IsInMainFrame()) {
     content::BackgroundTracingManager::GetInstance()->TriggerNamedEvent(
-        navigation_handle,
+        navigation_trigger_handle_,
         content::BackgroundTracingManager::StartedFinalizingCallback());
   }
 }
 
 content::BackgroundTracingManager::TriggerHandle
-    NavigationTracingObserver::navigation_handle = -1;
+    NavigationTracingObserver::navigation_trigger_handle_ = -1;
 
 }  // namespace tracing