Fixing removing entries from DUA too early.

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 177 matching lines @@
   // GetOrCreateDataUseRecorderEntry is not needed. The entry gets created in
   // DataUseAscriber::OnBeforeUrlRequest().
   const DataUseRecorderEntry entry = GetOrCreateDataUseRecorderEntry(request);
 
   if (entry == data_use_recorders_.end())
     return;
 
   for (auto& observer : observers_)
     observer.OnPageResourceLoad(*request, &entry->data_use());
 
-  bool will_datause_complete = false;
+  const auto frame_iter =
+      main_render_frame_data_use_map_.find(entry->main_frame_id());
+
+  // Check whether the frame is tracked in the main render frame map, and if it
+  // is, check if |entry| is currently tracked by that frame.
+  bool frame_is_tracked = frame_iter != main_render_frame_data_use_map_.end() &&
+                          frame_iter->second == entry;
+
+  // For non-main frame requests, the page load can only be tracked i nthe frame

[tbansal1, 2017/06/01 20:24:22]

nit:
s/i nthe/in the/

[RyanSturm, 2017/06/01 21:59:18]

Done.

+  // map.
+  bool page_load_is_tracked = frame_is_tracked;
+
   const content::ResourceRequestInfo* request_info =
       content::ResourceRequestInfo::ForRequest(request);
 
-  if (request_info &&
+  // If the frame is not tracked, but this is a main frame request, it might be
+  // the case that the navigation has not commit yet.
+  if (!frame_is_tracked && request_info &&
       request_info->GetResourceType() == content::RESOURCE_TYPE_MAIN_FRAME) {
-    will_datause_complete =
-        pending_navigation_data_use_map_.find(entry->main_frame_request_id()) ==
+    page_load_is_tracked =
+        pending_navigation_data_use_map_.find(entry->main_frame_request_id()) !=
         pending_navigation_data_use_map_.end();
-  } else {
-    // Non-mainframe, Services, and other requests.
-    const auto frame_iter =
-        main_render_frame_data_use_map_.find(entry->main_frame_id());
-    will_datause_complete =
-        frame_iter == main_render_frame_data_use_map_.end() ||
-        !frame_iter->second->HasPendingURLRequest(request);
   }
 
   DataUseAscriber::OnUrlRequestDestroyed(request);
-  request->RemoveUserData(DataUseRecorderEntryAsUserData::kUserDataKey);
 
-  if (entry->IsDataUseComplete() && will_datause_complete) {
+  // If all requests are done for |entry| and no more requests can be attributed
+  // to it, it is safe to delete.
+  if (entry->IsDataUseComplete() && !page_load_is_tracked) {
     NotifyDataUseCompleted(entry);
-    main_render_frame_data_use_map_.erase(entry->main_frame_id());
     data_use_recorders_.erase(entry);
   }
 }
 
 void ChromeDataUseAscriber::RenderFrameCreated(int render_process_id,
                                                int render_frame_id,
                                                int main_render_process_id,
                                                int main_render_frame_id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
@@ skipping 236 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