@Mounir - if this needs to land next week please can you submit and cherry pick it while I am away?

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/65a1ae787fd57bdf3846c3bcf7bff5b7bd54b03b

commit 65a1ae787fd57bdf3846c3bcf7bff5b7bd54b03b
Author: Mounir Lamouri <mlamouri@chromium.org>
Date: Mon Aug 21 15:23:32 2017

Disable Media Engagement and update tests to still work.

Bug:  754604 
Change-Id: I63ec82ed924da6fac8d7ac2dd1e3549d8c33feac
Reviewed-on: https://chromium-review.googlesource.com/618871
Commit-Queue: Mounir Lamouri <mlamouri@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#495938}
[modify] https://crrev.com/65a1ae787fd57bdf3846c3bcf7bff5b7bd54b03b/chrome/browser/media/media_engagement_contents_observer_unittest.cc
[modify] https://crrev.com/65a1ae787fd57bdf3846c3bcf7bff5b7bd54b03b/chrome/browser/media/media_engagement_score_unittest.cc
[modify] https://crrev.com/65a1ae787fd57bdf3846c3bcf7bff5b7bd54b03b/components/content_settings/core/browser/BUILD.gn
[modify] https://crrev.com/65a1ae787fd57bdf3846c3bcf7bff5b7bd54b03b/components/content_settings/core/browser/DEPS
[modify] https://crrev.com/65a1ae787fd57bdf3846c3bcf7bff5b7bd54b03b/components/content_settings/core/browser/website_settings_registry.cc
[modify] https://crrev.com/65a1ae787fd57bdf3846c3bcf7bff5b7bd54b03b/media/base/media_switches.cc

Before we approve merge to M61, please answer followings:
* Is this M61 regression? Is it critical?
* Is the change well baked/verified in Canary, having enough automation tests coverage and safe to merge to M61?
* Any other important details to justify the merge.

Please note We're only few weeks away from M61 Stable promotion, so merge bar is very high.

This bug requires manual review: We are only 13 days from stable.
Please contact the milestone owner if you have questions.
Owners: amineer@(Android), cmasso@(iOS), ketakid@(ChromeOS), govind@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

* Is this M61 regression? Is it critical?

It is to disable a feature.

* Is the change well baked/verified in Canary, having enough automation tests coverage and safe to merge to M61?

It is tested but because it's about disabling a feature, it should be quite safe in general.

* Any other important details to justify the merge.

Disabling a feature. We can do it via Finch but were told to do in code to make sure it hits 100% of users.

Approving merge to M61 branch 3163 based on comment #6. Please merge ASAP. If merge happens today before 1:00 PM PT, we can take it in for tomorrow's beta release. Thank you.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/6fdb9b3272bf39718ff96b1d5e64440d931a68a6

commit 6fdb9b3272bf39718ff96b1d5e64440d931a68a6
Author: Mounir Lamouri <mlamouri@chromium.org>
Date: Tue Aug 22 15:10:23 2017

Disable Media Engagement and update tests to still work.

TBR=mlamouri@chromium.org

(cherry picked from commit 65a1ae787fd57bdf3846c3bcf7bff5b7bd54b03b)

Bug:  754604 
Change-Id: I63ec82ed924da6fac8d7ac2dd1e3549d8c33feac
Reviewed-on: https://chromium-review.googlesource.com/618871
Commit-Queue: Mounir Lamouri <mlamouri@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#495938}
Reviewed-on: https://chromium-review.googlesource.com/626064
Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/branch-heads/3163@{#751}
Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
[modify] https://crrev.com/6fdb9b3272bf39718ff96b1d5e64440d931a68a6/chrome/browser/media/media_engagement_contents_observer_unittest.cc
[modify] https://crrev.com/6fdb9b3272bf39718ff96b1d5e64440d931a68a6/chrome/browser/media/media_engagement_score_unittest.cc
[modify] https://crrev.com/6fdb9b3272bf39718ff96b1d5e64440d931a68a6/components/content_settings/core/browser/BUILD.gn
[modify] https://crrev.com/6fdb9b3272bf39718ff96b1d5e64440d931a68a6/components/content_settings/core/browser/DEPS
[modify] https://crrev.com/6fdb9b3272bf39718ff96b1d5e64440d931a68a6/components/content_settings/core/browser/website_settings_registry.cc
[modify] https://crrev.com/6fdb9b3272bf39718ff96b1d5e64440d931a68a6/media/base/media_switches.cc