Convert NavigationTracingObserver to use the new navigation callbacks.

chrome/browser/tracing/navigation_tracing.cc

 // Copyright 2015 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 "chrome/browser/tracing/navigation_tracing.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/tracing/crash_service_uploader.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/tracing/common/tracing_switches.h"
 #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);
 
 using content::RenderFrameHost;
 
 namespace tracing {
 
 namespace {
 
@@ skipping 66 matching lines @@
       content::BackgroundTracingManager::NO_DATA_FILTERING);
 }
 
 bool NavigationTracingObserver::IsEnabled() {
   return content::BackgroundTracingManager::GetInstance()->HasActiveScenario();
 }
 
 NavigationTracingObserver::NavigationTracingObserver(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents) {
-  if (navigation_handle == -1) {
-    navigation_handle =
+  if (navigation_handle_ == -1) {
+    navigation_handle_ =
         content::BackgroundTracingManager::GetInstance()->RegisterTriggerType(
             kNavigationTracingConfig);
   }
 }
 
 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()) {

[fmeawad, 2017/01/26 15:44:37]

Does this excludes sub-frames? We are only interested in main frame navigations.
(the "In" part of InMainFrame is confusing)

[jam, 2017/01/26 16:33:35]

right !render_frame_host->GetParent() is equivalent to IsInMainFrame(). The "in"
is referring to  "is navigation IN main frame"

     content::BackgroundTracingManager::GetInstance()->TriggerNamedEvent(
-        navigation_handle,
+        navigation_handle_,
         content::BackgroundTracingManager::StartedFinalizingCallback());
   }
 }
 
 content::BackgroundTracingManager::TriggerHandle
-    NavigationTracingObserver::navigation_handle = -1;
+    NavigationTracingObserver::navigation_handle_ = -1;
 
 }  // namespace tracing