Construct the site engagement helper with a site engagement service.

chrome/browser/engagement/site_engagement_service.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_service.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 12 matching lines @@
 #include "chrome/browser/engagement/site_engagement_eviction_policy.h"
 #include "chrome/browser/engagement/site_engagement_metrics.h"
 #include "chrome/browser/engagement/site_engagement_score.h"
 #include "chrome/browser/engagement/site_engagement_service_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "components/history/core/browser/history_service.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/web_contents.h"
 #include "url/gurl.h"
 
 namespace {
 
 const int FOUR_WEEKS_IN_DAYS = 28;
 
 // Global bool to ensure we only update the parameters from variations once.
 bool g_updated_from_variations = false;
 
 // Length of time between metrics logging.
@@ skipping 269 matching lines @@
   // if there are an odd number of scores, or the average of the two middle
   // scores otherwise.
   std::sort(scores.begin(), scores.end());
   size_t mid = scores.size() / 2;
   if (scores.size() % 2 == 1)
     return scores[mid];
   else
     return (scores[mid - 1] + scores[mid]) / 2;
 }
 
-void SiteEngagementService::HandleMediaPlaying(const GURL& url,
-                                               bool is_hidden) {
+void SiteEngagementService::HandleMediaPlaying(
+    content::WebContents* web_contents, bool is_hidden) {
   SiteEngagementMetrics::RecordEngagement(
       is_hidden ? SiteEngagementMetrics::ENGAGEMENT_MEDIA_HIDDEN
                 : SiteEngagementMetrics::ENGAGEMENT_MEDIA_VISIBLE);
-  AddPoints(url, is_hidden ? SiteEngagementScore::GetHiddenMediaPoints()
-                           : SiteEngagementScore::GetVisibleMediaPoints());
+  AddPoints(web_contents->GetVisibleURL(),
+            is_hidden ? SiteEngagementScore::GetHiddenMediaPoints()
+                      : SiteEngagementScore::GetVisibleMediaPoints());
   RecordMetrics();
 }
 
-void SiteEngagementService::HandleNavigation(const GURL& url,
+void SiteEngagementService::HandleNavigation(content::WebContents* web_contents,
                                              ui::PageTransition transition) {
   if (IsEngagementNavigation(transition)) {
     SiteEngagementMetrics::RecordEngagement(
         SiteEngagementMetrics::ENGAGEMENT_NAVIGATION);
-    AddPoints(url, SiteEngagementScore::GetNavigationPoints());
+    AddPoints(web_contents->GetLastCommittedURL(),

[calamity, 2016/06/09 03:32:20]

Why not visible here? Is this going to be the same as the NavigationHandle's URL
above?

[dominickn, 2016/06/09 03:45:57]

The existing behaviour has the helper sending the URL after a navigation has
committed, so using the LastCommittedURL here should be consistent with the
previous behaviour. I actually explicitly changed this from using VisibleURL for
this reason.

[calamity, 2016/06/09 03:48:06]

Acknowledged.

+              SiteEngagementScore::GetNavigationPoints());
     RecordMetrics();
   }
 }
 
 void SiteEngagementService::HandleUserInput(
-    const GURL& url,
+    content::WebContents* web_contents,
     SiteEngagementMetrics::EngagementType type) {
   SiteEngagementMetrics::RecordEngagement(type);
-  AddPoints(url, SiteEngagementScore::GetUserInputPoints());
+  AddPoints(web_contents->GetVisibleURL(),
+            SiteEngagementScore::GetUserInputPoints());
   RecordMetrics();
 }
 
 void SiteEngagementService::OnURLsDeleted(
     history::HistoryService* history_service,
     bool all_history,
     bool expired,
     const history::URLRows& deleted_rows,
     const std::set<GURL>& favicon_urls) {
   std::multiset<GURL> origins;
@@ skipping 116 matching lines @@
         (proportion_remaining * engagement_score.GetScore()) + undecay);
     engagement_score.Reset(score, last_visit);
     if (!engagement_score.last_shortcut_launch_time().is_null()
         && engagement_score.last_shortcut_launch_time() > last_visit) {
       engagement_score.set_last_shortcut_launch_time(last_visit);
     }
 
     engagement_score.Commit();
   }
 }