Expose GlobalRequestID in NavigationHandle and ResourceRequestInfo.

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 137 matching lines @@
     // While remove() is a O(n) operation, the pending queue is not expected
     // to have a significant number of elements.
     DCHECK_GE(50u, pending_navigations_queue_.size());
     pending_navigations_queue_.remove(navigation_handle);
     return;
   }
 
   if (!ascriber_)
     return;
 
+  // In this case, is_success() will be false for the the main frame URLRequest
+  // and the pending navigation entry will be removed when URLRequest completes.
+  if (!navigation_handle->HasNetworkResponseStarted())
+    return;
+
   content::WebContents* web_contents = navigation_handle->GetWebContents();
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(
           &ChromeDataUseAscriber::DidFinishMainFrameNavigation,
           base::Unretained(ascriber_), navigation_handle->GetURL(),
+          navigation_handle->GetGlobalRequestID(),
           web_contents->GetRenderProcessHost()->GetID(),
           web_contents->GetMainFrame()->GetRoutingID(),
           !navigation_handle->HasCommitted() || navigation_handle->IsSamePage(),
           navigation_handle));
 }
 
 void ChromeDataUseAscriberService::DidRedirectNavigation(
     content::NavigationHandle* navigation_handle) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
@@ skipping 26 matching lines @@
   }
   pending_frames_queue_.clear();
 
   for (auto& it : pending_navigations_queue_) {
     DidStartNavigation(it);
   }
   pending_navigations_queue_.clear();
 }
 
 }  // namespace data_use_measurement