[Media Engagement] Remove visits with media tag

This was never used and therefore we can remove
it. If there is old data stored then this will
also remove it.

BUG=998687

Change-Id: I9ad4a99c3fa2f8786f302bad7334a7882e2d75eb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1775186Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Commit-Queue: Becca Hughes <beccahughes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#691669}

chrome/browser/media/media_engagement_score.cc

@@ -21,8 +21,6 @@ const char MediaEngagementScore::kHasHighScoreKey[] = "hasHighScore";
 const char MediaEngagementScore::kAudiblePlaybacksKey[] = "audiblePlaybacks";
 const char MediaEngagementScore::kSignificantPlaybacksKey[] =
     "significantPlaybacks";
-const char MediaEngagementScore::kVisitsWithMediaTagKey[] =
-    "visitsWithMediaTag";
 const char MediaEngagementScore::kHighScoreChanges[] = "highScoreChanges";
 const char MediaEngagementScore::kSignificantMediaPlaybacksKey[] =
     "mediaElementPlaybacks";
@@ -122,8 +120,6 @@ MediaEngagementScore::MediaEngagementScore(
                       &audible_playbacks_);
   GetIntegerFromScore(score_dict_.get(), kSignificantPlaybacksKey,
                       &significant_playbacks_);
-  GetIntegerFromScore(score_dict_.get(), kVisitsWithMediaTagKey,
-                      &visits_with_media_tag_);
   GetIntegerFromScore(score_dict_.get(), kHighScoreChanges,
                       &high_score_changes_);
   GetIntegerFromScore(score_dict_.get(), kSignificantMediaPlaybacksKey,
@@ -208,7 +204,6 @@ bool MediaEngagementScore::UpdateScoreDict() {
   bool is_high = false;
   int stored_audible_playbacks = 0;
   int stored_significant_playbacks = 0;
-  int stored_visits_with_media_tag = 0;
   int high_score_changes = 0;
   int stored_media_element_playbacks = 0;
   int stored_audio_context_playbacks = 0;
@@ -239,8 +234,6 @@ bool MediaEngagementScore::UpdateScoreDict() {
                       &stored_audible_playbacks);
   GetIntegerFromScore(score_dict_.get(), kSignificantPlaybacksKey,
                       &stored_significant_playbacks);
-  GetIntegerFromScore(score_dict_.get(), kVisitsWithMediaTagKey,
-                      &stored_visits_with_media_tag);
   GetIntegerFromScore(score_dict_.get(), kHighScoreChanges,
                       &high_score_changes);
   GetIntegerFromScore(score_dict_.get(), kSignificantMediaPlaybacksKey,
@@ -253,7 +246,6 @@ bool MediaEngagementScore::UpdateScoreDict() {
                  is_high_ != is_high ||
                  stored_audible_playbacks != audible_playbacks() ||
                  stored_significant_playbacks != significant_playbacks() ||
-                 stored_visits_with_media_tag != visits_with_media_tag() ||
                  stored_media_element_playbacks != media_element_playbacks() ||
                  stored_audio_context_playbacks != audio_context_playbacks() ||
                  stored_last_media_playback_internal !=
@@ -276,13 +268,16 @@ bool MediaEngagementScore::UpdateScoreDict() {
   score_dict_->SetBoolean(kHasHighScoreKey, is_high_);
   score_dict_->SetInteger(kAudiblePlaybacksKey, audible_playbacks_);
   score_dict_->SetInteger(kSignificantPlaybacksKey, significant_playbacks_);
-  score_dict_->SetInteger(kVisitsWithMediaTagKey, visits_with_media_tag_);
   score_dict_->SetInteger(kHighScoreChanges, high_score_changes_);
   score_dict_->SetInteger(kSignificantMediaPlaybacksKey,
                           media_element_playbacks_);
   score_dict_->SetInteger(kSignificantAudioContextPlaybacksKey,
                           audio_context_playbacks_);
 
+  // visitsWithMediaTag was deprecated in https://crbug.com/998687 and should
+  // be removed if we see it in |score_dict_|.
+  score_dict_->RemoveKey("visitsWithMediaTag");
+
   return true;
 }
 

chrome/browser/media/media_engagement_score.h

@@ -26,20 +26,18 @@ class MediaEngagementScore final {
   // store whether the score is considered high. kAudiblePlaybacksKey will
   // store the number of audible playbacks on an origin.
   // kSignificantPlaybacksKey will store the number of significant playbacks
-  // on an origin. kVisitsWithMediaTagKey will store the number of visits to
-  // an origin where at least one page had a media tag.
-  // kSignificantMediaPlaybacksKey will store significant playbacks that
-  // originated from media elements and kSignificantAudioContextPlaybacksKey
-  // will store significant playbacks originated from audio contexts. The
-  // sum of the two may be higher than kMediaPlaybacksKey as a visit may have
-  // both an audio context playback and a media element playback.
+  // on an origin. kSignificantMediaPlaybacksKey will store significant
+  // playbacks that originated from media elements and
+  // kSignificantAudioContextPlaybacksKey will store significant playbacks
+  // originated from audio contexts. The sum of the two may be higher than
+  // kMediaPlaybacksKey as a visit may have both an audio context playback
+  // and a media element playback.
   static const char kVisitsKey[];
   static const char kMediaPlaybacksKey[];
   static const char kLastMediaPlaybackTimeKey[];
   static const char kHasHighScoreKey[];
   static const char kAudiblePlaybacksKey[];
   static const char kSignificantPlaybacksKey[];
-  static const char kVisitsWithMediaTagKey[];
   static const char kHighScoreChanges[];
   static const char kSignificantMediaPlaybacksKey[];
   static const char kSignificantAudioContextPlaybacksKey[];
@@ -106,12 +104,6 @@ class MediaEngagementScore final {
     set_significant_playbacks(significant_playbacks_ + amount);
   }
 
-  // Get/increment the number of visits where at least one page had a media tag.
-  int visits_with_media_tag() const { return visits_with_media_tag_; }
-  void IncrementVisitsWithMediaTag() {
-    set_visits_with_media_tag(visits_with_media_tag_ + 1);
-  }
-
   // Get/increment the number of significant playbacks from media elements this
   // origin had.
   int media_element_playbacks() const { return media_element_playbacks_; }
@@ -152,9 +144,6 @@ class MediaEngagementScore final {
   void set_significant_playbacks(int playbacks) {
     significant_playbacks_ = playbacks;
   }
-  void set_visits_with_media_tag(int visits) {
-    visits_with_media_tag_ = visits;
-  }
   void set_media_element_playbacks(int playbacks) {
     media_element_playbacks_ = playbacks;
   }
@@ -196,9 +185,6 @@ class MediaEngagementScore final {
   // The number of significant media playbacks this origin had.
   int significant_playbacks_ = 0;
 
-  // The number of visits with a media tag this origin had.
-  int visits_with_media_tag_ = 0;
-
   // The last time media was played back on this origin.
   base::Time last_media_playback_time_;