Revert of 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 101 matching lines @@
                  parent_render_frame_id));
 }
 
 void ChromeDataUseAscriberService::DidStartNavigation(
     content::NavigationHandle* navigation_handle) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   if (!navigation_handle->IsInMainFrame())
     return;
 
+  if (!is_initialized_) {
+    pending_navigations_queue_.push_back(navigation_handle);
+    return;
+  }
+
   if (!ascriber_)
     return;
 
   content::WebContents* web_contents = navigation_handle->GetWebContents();
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&ChromeDataUseAscriber::DidStartMainFrameNavigation,
                  base::Unretained(ascriber_), navigation_handle->GetURL(),
                  web_contents->GetRenderProcessHost()->GetID(),
                  web_contents->GetMainFrame()->GetRoutingID(),
                  navigation_handle));
 }
 
-void ChromeDataUseAscriberService::ReadyToCommitNavigation(
+void ChromeDataUseAscriberService::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   if (!navigation_handle->IsInMainFrame())
     return;
 
+  if (!is_initialized_) {
+    // 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;
 
   content::WebContents* web_contents = navigation_handle->GetWebContents();
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(
-          &ChromeDataUseAscriber::ReadyToCommitMainFrameNavigation,
+          &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 18 matching lines @@
   DCHECK(!is_initialized_);
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   ascriber_ = ascriber;
   is_initialized_ = true;
 
   for (auto& it : pending_frames_queue_) {
     RenderFrameCreated(it);
   }
   pending_frames_queue_.clear();
+
+  for (auto& it : pending_navigations_queue_) {
+    DidStartNavigation(it);
+  }
+  pending_navigations_queue_.clear();
 }
 
 }  // namespace data_use_measurement