Commit b88d8012 authored by Becca Hughes's avatar Becca Hughes Committed by Commit Bot

[Media Engagement] Remove deprecated fields from WebUI

Remove deprecated media engagement fields from the
chrome://media-engagement WebUI.

BUG=998892

Change-Id: I5dadab504404602c22c5773411816eb4c7518b71
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1776398
Commit-Queue: Becca Hughes <beccahughes@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#692071}
parent 8c9ab26b
...@@ -167,9 +167,7 @@ media::mojom::MediaEngagementScoreDetailsPtr ...@@ -167,9 +167,7 @@ media::mojom::MediaEngagementScoreDetailsPtr
MediaEngagementScore::GetScoreDetails() const { MediaEngagementScore::GetScoreDetails() const {
return media::mojom::MediaEngagementScoreDetails::New( return media::mojom::MediaEngagementScoreDetails::New(
origin_, actual_score(), visits(), media_playbacks(), origin_, actual_score(), visits(), media_playbacks(),
last_media_playback_time().ToJsTime(), high_score(), audible_playbacks(), last_media_playback_time().ToJsTime(), high_score());
significant_playbacks(), high_score_changes(), audio_context_playbacks(),
media_element_playbacks());
} }
MediaEngagementScore::~MediaEngagementScore() = default; MediaEngagementScore::~MediaEngagementScore() = default;
......
...@@ -19,17 +19,6 @@ struct MediaEngagementScoreDetails { ...@@ -19,17 +19,6 @@ struct MediaEngagementScoreDetails {
// Whether the score is considered to be high. // Whether the score is considered to be high.
bool is_high; bool is_high;
// Data used for experiments.
int32 audible_playbacks;
int32 significant_playbacks;
// How many time the score changed `is_high` status.
int32 high_score_changes;
// Details of the components which make up |media_playbacks|.
int32 audio_context_playbacks;
int32 media_element_playbacks;
}; };
struct MediaEngagementConfig { struct MediaEngagementConfig {
......
...@@ -144,13 +144,6 @@ class MediaEngagementScoreTest : public ChromeRenderViewHostTestHarness { ...@@ -144,13 +144,6 @@ class MediaEngagementScoreTest : public ChromeRenderViewHostTestHarness {
EXPECT_EQ(details->media_playbacks, score->media_playbacks()); EXPECT_EQ(details->media_playbacks, score->media_playbacks());
EXPECT_EQ(details->last_media_playback_time, EXPECT_EQ(details->last_media_playback_time,
score->last_media_playback_time().ToJsTime()); score->last_media_playback_time().ToJsTime());
EXPECT_EQ(details->audible_playbacks, score->audible_playbacks());
EXPECT_EQ(details->significant_playbacks, score->significant_playbacks());
EXPECT_EQ(details->high_score_changes, score->high_score_changes());
EXPECT_EQ(details->audio_context_playbacks,
score->audio_context_playbacks());
EXPECT_EQ(details->media_element_playbacks,
score->media_element_playbacks());
} }
void OverrideFieldTrial(int min_visits, void OverrideFieldTrial(int min_visits,
......
...@@ -140,27 +140,12 @@ ...@@ -140,27 +140,12 @@
<th sort-key="mediaPlaybacks" sort-reverse> <th sort-key="mediaPlaybacks" sort-reverse>
Sessions with playback Sessions with playback
</th> </th>
<th sort-key="audioContextPlaybacks" sort-reverse>
Sessions with playback<br>(audio context only)
</th>
<th sort-key="mediaElementPlaybacks" sort-reverse>
Sessions with playback<br>(media element only)
</th>
<th sort-key="audiblePlaybacks" sort-reverse>
Audible Playbacks*
</th>
<th sort-key="significantPlaybacks" sort-reverse>
Significant Playbacks*
</th>
<th sort-key="lastMediaPlaybackTime" sort-reverse> <th sort-key="lastMediaPlaybackTime" sort-reverse>
Last Playback Last Playback
</th> </th>
<th sort-key="isHigh" sort-reverse> <th sort-key="isHigh" sort-reverse>
Is High Is High
</th> </th>
<th sort-key="highScoreChanges" sort-reverse>
Is High Changes
</th>
<th sort-key="totalScore" class="sort-column" sort-reverse> <th sort-key="totalScore" class="sort-column" sort-reverse>
Score Score
</th> </th>
...@@ -170,22 +155,13 @@ ...@@ -170,22 +155,13 @@
</tbody> </tbody>
</table> </table>
<p>
* These columns are experimental and do not currently affect the MEI score.
</p>
<template id="datarow"> <template id="datarow">
<tr> <tr>
<td class="origin-cell"></td> <td class="origin-cell"></td>
<td class="visits-count-cell"></td> <td class="visits-count-cell"></td>
<td class="media-playbacks-count-cell"></td> <td class="media-playbacks-count-cell"></td>
<td class="audio-context-playbacks-count-cell"></td>
<td class="media-element-playbacks-count-cell"></td>
<td class="audible-playbacks-count-cell"></td>
<td class="significant-playbacks-count-cell"></td>
<td class="last-playback-time-cell"></td> <td class="last-playback-time-cell"></td>
<td class="is-high-cell"></td> <td class="is-high-cell"></td>
<td class="is-high-changes-cell"></td>
<td class="total-score-cell"></td> <td class="total-score-cell"></td>
<td class="engagement-bar-cell"> <td class="engagement-bar-cell">
<div class="engagement-bar"></div> <div class="engagement-bar"></div>
......
...@@ -39,17 +39,12 @@ function createRow(rowInfo) { ...@@ -39,17 +39,12 @@ function createRow(rowInfo) {
td[1].textContent = rowInfo.visits; td[1].textContent = rowInfo.visits;
td[2].textContent = rowInfo.mediaPlaybacks; td[2].textContent = rowInfo.mediaPlaybacks;
td[3].textContent = rowInfo.audioContextPlaybacks; td[3].textContent = rowInfo.lastMediaPlaybackTime ?
td[4].textContent = rowInfo.mediaElementPlaybacks;
td[5].textContent = rowInfo.audiblePlaybacks;
td[6].textContent = rowInfo.significantPlaybacks;
td[7].textContent = rowInfo.lastMediaPlaybackTime ?
new Date(rowInfo.lastMediaPlaybackTime).toISOString() : new Date(rowInfo.lastMediaPlaybackTime).toISOString() :
''; '';
td[8].textContent = rowInfo.isHigh ? 'Yes' : 'No'; td[4].textContent = rowInfo.isHigh ? 'Yes' : 'No';
td[9].textContent = rowInfo.highScoreChanges; td[5].textContent = rowInfo.totalScore ? rowInfo.totalScore.toFixed(2) : '0';
td[10].textContent = rowInfo.totalScore ? rowInfo.totalScore.toFixed(2) : '0'; td[6].getElementsByClassName('engagement-bar')[0].style.width =
td[11].getElementsByClassName('engagement-bar')[0].style.width =
(rowInfo.totalScore * 50) + 'px'; (rowInfo.totalScore * 50) + 'px';
return document.importNode(template.content, true); return document.importNode(template.content, true);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment