Revert of Remove the 10 second delay before user input generates engagement. (patchset #1 id:1 of h…

chrome/browser/engagement/site_engagement_helper.cc

 // Copyright 2015 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/engagement/site_engagement_helper.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "chrome/browser/engagement/site_engagement_service.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/associated_interface_provider.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
 namespace {
 
 int g_seconds_to_pause_engagement_detection = 10;
+int g_seconds_delay_after_navigation = 10;
 int g_seconds_delay_after_media_starts = 10;
 int g_seconds_delay_after_show = 5;
 
 }  // anonymous namespace
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(SiteEngagementService::Helper);
 
 // static
 void SiteEngagementService::Helper::SetSecondsBetweenUserInputCheck(
     int seconds) {
   g_seconds_to_pause_engagement_detection = seconds;
 }
 
 // static
+void SiteEngagementService::Helper::SetSecondsTrackingDelayAfterNavigation(
+    int seconds) {
+  g_seconds_delay_after_navigation = seconds;
+}
+
+// static
 void SiteEngagementService::Helper::SetSecondsTrackingDelayAfterShow(
     int seconds) {
   g_seconds_delay_after_show = seconds;
 }
 
 SiteEngagementService::Helper::~Helper() {
   service_->HelperDeleted(this);
   if (web_contents()) {
     input_tracker_.Stop();
     media_tracker_.Stop();
@@ skipping 203 matching lines @@
   //   always assigned the LINK transition, which is ignored for navigation
   //   engagement.
   //
   // Prerenders trigger WasShown() when they are swapped in, so input engagement
   // will activate even if navigation engagement is not scored.
   if (prerender::PrerenderContents::FromWebContents(web_contents()) != nullptr)
     return;
 
   service_->HandleNavigation(web_contents(), handle->GetPageTransition());
 
-  input_tracker_.Start(base::TimeDelta::FromSeconds(0));
+  input_tracker_.Start(
+      base::TimeDelta::FromSeconds(g_seconds_delay_after_navigation));
 }
 
 void SiteEngagementService::Helper::ReadyToCommitNavigation(
     content::NavigationHandle* handle) {
   if (service_->ShouldRecordEngagement(handle->GetURL())) {
     // Don't bother sending the engagement if we wouldn't have recorded any for
     // the URL. These will have NONE engagement by default.
     SendEngagementLevelToFrame(url::Origin(handle->GetURL()),
                                service_->GetEngagementLevel(handle->GetURL()),
                                handle->GetRenderFrameHost());
   }
 }
 
 void SiteEngagementService::Helper::WasShown() {
   // Ensure that the input callbacks are registered when we come into view.
   input_tracker_.Start(
       base::TimeDelta::FromSeconds(g_seconds_delay_after_show));
 }
 
 void SiteEngagementService::Helper::WasHidden() {
   // Ensure that the input callbacks are not registered when hidden.
   input_tracker_.Stop();
 }