Support for transfer navigations in data use ascriber

chrome/browser/data_use_measurement/chrome_data_use_ascriber_service.cc

 // Copyright 2016 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/data_use_measurement/chrome_data_use_ascriber_service.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/data_use_measurement/chrome_data_use_ascriber.h"
@@ skipping 136 matching lines @@
   if (!navigation_handle->IsInMainFrame())
     return;
 
   if (!ascriber_)
     return;
 
   content::WebContents* web_contents = navigation_handle->GetWebContents();
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::BindOnce(&ChromeDataUseAscriber::ReadyToCommitMainFrameNavigation,
-                     base::Unretained(ascriber_), navigation_handle->GetURL(),
+                     base::Unretained(ascriber_),
                      navigation_handle->GetGlobalRequestID(),
                      web_contents->GetRenderProcessHost()->GetID(),
-                     web_contents->GetMainFrame()->GetRoutingID(),
-                     !navigation_handle->HasCommitted() ||
-                         navigation_handle->IsSameDocument(),
-                     navigation_handle));
+                     web_contents->GetMainFrame()->GetRoutingID()));
 }
 
 void ChromeDataUseAscriberService::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  if (!navigation_handle->IsInMainFrame() ||
-      !navigation_handle->HasCommitted() || navigation_handle->IsSameDocument())
+  if (!navigation_handle->IsInMainFrame() || !navigation_handle->HasCommitted())
     return;
 
   if (!ascriber_)
     return;
 
   content::WebContents* web_contents = navigation_handle->GetWebContents();
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::BindOnce(&ChromeDataUseAscriber::DidFinishNavigation,
                      base::Unretained(ascriber_),
                      web_contents->GetRenderProcessHost()->GetID(),
                      web_contents->GetMainFrame()->GetRoutingID(),
+                     navigation_handle->GetURL(),
+                     navigation_handle->IsSameDocument(),
                      navigation_handle->GetPageTransition()));
 }
 
 void ChromeDataUseAscriberService::SetDataUseAscriber(
     ChromeDataUseAscriber* ascriber) {
   DCHECK(!is_initialized_);
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   ascriber_ = ascriber;
   is_initialized_ = true;
@@ skipping 41 matching lines @@
         content::BrowserThread::IO, FROM_HERE,
         base::BindOnce(
             &ChromeDataUseAscriber::RenderFrameHostChanged,
             base::Unretained(ascriber_), old_host->GetProcess()->GetID(),
             old_host->GetRoutingID(), new_host->GetProcess()->GetID(),
             new_host->GetRoutingID()));
   }
 }
 
 }  // namespace data_use_measurement