Revert of Expose GlobalRequestID in NavigationHandle and ResourceRequestInfo.

chrome/browser/data_use_measurement/chrome_data_use_ascriber_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_DATA_USE_MEASUREMENT_CHROME_DATA_USE_ASCRIBER_SERVICE_H_
 #define CHROME_BROWSER_DATA_USE_MEASUREMENT_CHROME_DATA_USE_ASCRIBER_SERVICE_H_
 
 #include <list>
 
 #include "base/macros.h"
@@ skipping 32 matching lines @@
   // |ascriber_| on the IO thread. RenderFrameHost methods cannot be called
   // on the IO thread, so only routing IDs of |render_frame_host| and its parent
   // are propagated.
   void RenderFrameDeleted(content::RenderFrameHost* render_frame_host);
 
   // Called when a navigation is started. Propagates main frame navigation
   // start to the |ascriber_| on the IO thread. NavigationHandle methods
   // cannot be called on the IO thread, so the pointer is cast to void*.
   void DidStartNavigation(content::NavigationHandle* navigation_handle);
 
-  // Called when the navigation is ready to be committed in a renderer.
-  // Propagates the event to the |ascriber_| on the IO thread. NavigationHandle
-  // methods cannot be called on the IO thread, so the pointer is cast to void*.
-  void ReadyToCommitNavigation(content::NavigationHandle* navigation_handle);
+  // Called when a navigation is finished. Propagates main frame navigation
+  // finish to the |ascriber_| on the IO thread. NavigationHandle methods
+  // cannot be called on the IO thread, so the pointer is cast to void*.
+  void DidFinishNavigation(content::NavigationHandle* navigation_handle);
 
   // Called when a navigation is redirected. Propagates main frame navigation
   // redirect to the |ascriber_| on the IO thread. NavigationHandle methods
   // cannot be called on the IO thread, so the pointer is cast to void*.
   void DidRedirectNavigation(content::NavigationHandle* navigation_handle);
 
  private:
   friend class ChromeDataUseAscriberServiceTest;
 
   void SetDataUseAscriber(ChromeDataUseAscriber* ascriber);
 
   // |ascriber_| outlives this instance.
   ChromeDataUseAscriber* ascriber_;
 
   // Tracks whether |ascriber_| was set. This field is required because tests
   // might set |ascriber_| to nullptr.
   bool is_initialized_;
 
-  // Frame events might arrive from the UI thread before |ascriber_| is set. A
-  // queue of frame events that arrive before |ascriber_| is set is maintained
-  // in this field so that they can be propagated immediately after |ascriber_|
-  // is set. The RenderFrameHost pointers in the queues are valid for the
-  // duration that they are in the queue.
+  // Frame and navigation events might arrive from the UI thread before
+  // |ascriber_| is set. A queue of frame and navigation events that arrive
+  // before |ascriber_| is set are maintained in these fields so that they can
+  // be propagated immediately after |ascriber_| is set. The RenderFrameHost
+  // and NavigationHandle pointers in the queues are valid for the duration that
+  // they are in the queue.
   std::list<content::RenderFrameHost*> pending_frames_queue_;
+  std::list<content::NavigationHandle*> pending_navigations_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeDataUseAscriberService);
 };
 
 }  // namespace data_use_measurement
 
 #endif  // CHROME_BROWSER_DATA_USE_MEASUREMENT_CHROME_DATA_USE_ASCRIBER_SERVICE_H_