Support for transfer navigations in data use ascriber

chrome/browser/data_use_measurement/chrome_data_use_ascriber.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_H_
 #define CHROME_BROWSER_DATA_USE_MEASUREMENT_CHROME_DATA_USE_ASCRIBER_H_
 
 #include <list>
 #include <memory>
 #include <string>
@@ skipping 70 matching lines @@
 
   // Called when a main frame navigation is started.
   void DidStartMainFrameNavigation(GURL gurl,
                                    int render_process_id,
                                    int render_frame_id,
                                    void* navigation_handle);
 
   // Called when a main frame navigation is ready to be committed in a
   // renderer.
   void ReadyToCommitMainFrameNavigation(
-      GURL gurl,
       content::GlobalRequestID global_request_id,
       int render_process_id,
-      int render_frame_id,
-      bool is_same_page_navigation,
-      void* navigation_handle);
+      int render_frame_id);
 
   // Called every time the WebContents changes visibility.
   void WasShownOrHidden(int main_render_process_id,
                         int main_render_frame_id,
                         bool visible);
 
   // Called whenever one of the render frames of a WebContents is swapped.
   void RenderFrameHostChanged(int old_render_process_id,
                               int old_render_frame_id,
                               int new_render_process_id,
                               int new_render_frame_id);
 
   void DidFinishNavigation(int render_process_id,
                            int render_frame_id,
+                           GURL gurl,
+                           bool is_same_page_navigation,
                            uint32_t page_transition);
 
  private:
   friend class ChromeDataUseAscriberTest;
 
   // Entry in the |data_use_recorders_| list which owns all instances of
   // DataUseRecorder.
   typedef std::list<ChromeDataUseRecorder> DataUseRecorderList;
   typedef DataUseRecorderList::iterator DataUseRecorderEntry;
 
@@ skipping 14 matching lines @@
 
     static const void* kUserDataKey;
 
    private:
     DataUseRecorderEntry entry_;
   };
 
   DataUseRecorderEntry GetOrCreateDataUseRecorderEntry(
       net::URLRequest* request);
 
+  void NotifyPageLoadCommit(DataUseRecorderEntry entry);
   void NotifyDataUseCompleted(DataUseRecorderEntry entry);
 
   DataUseRecorderEntry CreateNewDataUseRecorder(
       net::URLRequest* request,
       DataUse::TrafficType traffic_type);
 
   bool IsRecorderInPendingNavigationMap(net::URLRequest* request);
 
   bool IsRecorderInRenderFrameMap(net::URLRequest* request);
 
   // Owner for all instances of DataUseRecorder. An instance is kept in this
   // list if any entity (render frame hosts, URLRequests, pending navigations)
   // that ascribe data use to the instance exists, and deleted when all
   // ascribing entities go away.
   DataUseRecorderList data_use_recorders_;
 
-  // Map from RenderFrameHost to the DataUseRecorderEntry in
+  // TODO(rajendrant): Combine the multiple hash_maps keyed by
+  // RenderFrameHostID. Map from RenderFrameHost to the DataUseRecorderEntry in
   // |data_use_recorders_| that the main frame ascribes data use to.
   base::hash_map<RenderFrameHostID, DataUseRecorderEntry>
       main_render_frame_data_use_map_;
 
   // Maps subframe IDs to the mainframe ID, so the mainframe lifetime can have
   // ownership over the lifetime of entries in |data_use_recorders_|. Mainframes
   // are mapped to themselves.
   base::hash_map<RenderFrameHostID, RenderFrameHostID>
       subframe_to_mainframe_map_;
 
   // Map from pending navigations to the DataUseRecorderEntry in
   // |data_use_recorders_| that the navigation ascribes data use to.
   std::unordered_map<content::GlobalRequestID,
                      DataUseRecorderEntry,
                      GlobalRequestIDHash>
       pending_navigation_data_use_map_;
 
+  // Contains the global requestid of pending navigations in the mainframe. This
+  // is needed to support navigations that transfer from one mainframe to
+  // another.
+  base::hash_map<RenderFrameHostID, content::GlobalRequestID>
+      pending_navigation_global_request_id_;
+
   // Contains the mainframe IDs that are currently visible.
   base::hash_set<RenderFrameHostID> visible_main_render_frames_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeDataUseAscriber);
 };
 
 }  // namespace data_use_measurement
 
 #endif  // CHROME_BROWSER_DATA_USE_MEASUREMENT_CHROME_DATA_USE_ASCRIBER_H_