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 <utility>
 
 #include "base/memory/ptr_util.h"
@@ skipping 361 matching lines @@
       data_use_recorders_.erase(entry);
     }
     return;
   }
   DataUseRecorderEntry old_frame_entry =
       main_frame_it->second.data_use_recorder;
   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);
     }
 
     DataUse& data_use = entry->data_use();
     DCHECK(!data_use.url().is_valid() || data_use.url() == gurl)
         << "is valid: " << data_use.url().is_valid()
@@ skipping 29 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) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   auto main_frame_it = main_render_frame_entry_map_.find(
       RenderFrameHostID(main_render_process_id, main_render_frame_id));
   if (main_frame_it != main_render_frame_entry_map_.end()) {
@@ skipping 22 matching lines @@
           .find(RenderFrameHostID(new_render_process_id, new_render_frame_id))
           ->second.pending_navigation_global_request_id =
           old_frame_iter->second.pending_navigation_global_request_id;
       old_frame_iter->second.pending_navigation_global_request_id =
           content::GlobalRequestID();
     }
   }
 }
 
 }  // namespace data_use_measurement