Lose the user gesture expiration check on IdentifyReferrerChainByWebContents

chrome/browser/safe_browsing/safe_browsing_navigation_observer_manager.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/safe_browsing/safe_browsing_navigation_observer_manager.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
@@ skipping 238 matching lines @@
   // Remove entry from |user_gesture_map_| as a user_gesture is consumed by
   // a navigation event.
   if (it != user_gesture_map_.end() && timestamp >= it->second)
     user_gesture_map_.erase(it);
 }
 
 bool SafeBrowsingNavigationObserverManager::HasUserGesture(
     content::WebContents* web_contents) {
   if (!web_contents)
     return false;
-  auto it = user_gesture_map_.find(web_contents);
-  if (it != user_gesture_map_.end() &&
-      !IsEventExpired(it->second, kUserGestureTTLInSecond)) {
+  if (user_gesture_map_.find(web_contents) != user_gesture_map_.end())

[lpz, 2017/05/17 20:22:04]

just to confirm my understanding. It's ok to remove the IsEventExpired check
here because we're not worried about having *very* old gestures in this map
(since CleanUpUserGestures is expected to be called every ~2m)?

[Jialiu Lin, 2017/05/17 20:58:24]

Yes, that's right. 

     return true;
-  }
   return false;
 }
 
 void SafeBrowsingNavigationObserverManager::RecordHostToIpMapping(
     const std::string& host,
     const std::string& ip) {
   auto insert_result = host_to_ip_map_.insert(
       std::make_pair(host, std::vector<ResolvedIPAddress>()));
   if (!insert_result.second) {
     // host_to_ip_map already contains this key.
@@ skipping 158 matching lines @@
 void SafeBrowsingNavigationObserverManager::CleanUpNavigationEvents() {
   std::size_t removal_count = navigation_event_list_.CleanUpNavigationEvents();
 
   UMA_HISTOGRAM_COUNTS_10000(
       "SafeBrowsing.NavigationObserver.NavigationEventCleanUpCount",
       removal_count);
 }
 
 void SafeBrowsingNavigationObserverManager::CleanUpUserGestures() {
   for (auto it = user_gesture_map_.begin(); it != user_gesture_map_.end();) {
-    if (IsEventExpired(it->second, kUserGestureTTLInSecond))
+    if (IsEventExpired(it->second, kNavigationFootprintTTLInSecond))
       it = user_gesture_map_.erase(it);
     else
       ++it;
   }
 }
 
 void SafeBrowsingNavigationObserverManager::CleanUpIpAddresses() {
   std::size_t remove_count = 0;
   for (auto it = host_to_ip_map_.begin(); it != host_to_ip_map_.end();) {
     std::size_t size_before_removal = it->second.size();
@@ skipping 129 matching lines @@
             out_result));
     // Stop searching if the size of out_referrer_chain already reached its
     // limit.
     if (out_referrer_chain->size() == kReferrerChainMaxLength)
       return;
     last_main_frame_url_traced = last_nav_event_traced->source_main_frame_url;
   }
 }
 
 }  // namespace safe_browsing