Support moving pending requests from one DataUseRecorder to another

chrome/browser/data_use_measurement/chrome_data_use_ascriber.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.h"
 
 #include <string>
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/data_use_measurement/chrome_data_use_recorder.h"
@@ skipping 352 matching lines @@
       main_render_frame_data_use_map_.erase(entry->main_frame_id());
       data_use_recorders_.erase(entry);
     }
     return;
   }
   DataUseRecorderEntry old_frame_entry = frame_it->second;
   old_frame_entry->set_page_transition(page_transition);
   NotifyPageLoadCommit(old_frame_entry);
 
   if (is_same_page_navigation) {
-    old_frame_entry->MergeFrom(&(*entry));
-
-    for (auto* request : entry->pending_url_requests())
-      AscribeRecorderWithRequest(request, old_frame_entry);
-
-    entry->RemoveAllPendingURLRequests();
+    for (auto& request : entry->pending_url_requests()) {
+      AscribeRecorderWithRequest(request.first, old_frame_entry);
+      old_frame_entry->MovePendingURLRequest(&(*entry), request.first);
+    }
     data_use_recorders_.erase(entry);
   } else {
     if (old_frame_entry->IsDataUseComplete()) {
       NotifyDataUseCompleted(old_frame_entry);
       data_use_recorders_.erase(old_frame_entry);
 
       if (visible_main_render_frames_.find(mainframe) !=
           visible_main_render_frames_.end()) {
         entry->set_is_visible(true);
       }
@@ skipping 35 matching lines @@
     DataUse::TrafficType traffic_type) {
   DataUseRecorderEntry entry =
       data_use_recorders_.emplace(data_use_recorders_.end(), traffic_type);
   if (request)
     AscribeRecorderWithRequest(request, entry);
   return entry;
 }
 
 void ChromeDataUseAscriber::AscribeRecorderWithRequest(
     net::URLRequest* request,
-    DataUseRecorderEntry recorder) {
-  recorder->AddPendingURLRequest(request);
-  request->SetUserData(
-      DataUseRecorderEntryAsUserData::kUserDataKey,
-      base::MakeUnique<DataUseRecorderEntryAsUserData>(recorder));
+    DataUseRecorderEntry entry) {
+  entry->AddPendingURLRequest(request);
+  request->SetUserData(DataUseRecorderEntryAsUserData::kUserDataKey,
+                       base::MakeUnique<DataUseRecorderEntryAsUserData>(entry));
 }
 
 void ChromeDataUseAscriber::WasShownOrHidden(int main_render_process_id,
                                              int main_render_frame_id,
                                              bool visible) {
   RenderFrameHostID main_render_frame_host_id(main_render_process_id,
                                               main_render_frame_id);
 
   auto frame_iter =
       main_render_frame_data_use_map_.find(main_render_frame_host_id);
@@ skipping 20 matching lines @@
       pending_navigation_global_request_id_.find(old_frame);
   if (pending_navigation_iter != pending_navigation_global_request_id_.end()) {
     pending_navigation_global_request_id_.insert(std::make_pair(
         RenderFrameHostID(new_render_process_id, new_render_frame_id),
         pending_navigation_iter->second));
     pending_navigation_global_request_id_.erase(pending_navigation_iter);
   }
 }
 
 }  // namespace data_use_measurement