Remove mlamouri from OWNERS, WATCHLIST, and histograms.

Bug: None
Change-Id: I7c536aab812609a0612cb4c4838cf8d5422f557e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2787977
Reviewed-by: Mark Pearson <mpearson@chromium.org>
Reviewed-by: Robert Kaplow <rkaplow@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Jeremy Roman <jbroman@chromium.org>
Reviewed-by: Tommy Steimel <steimel@chromium.org>
Reviewed-by: Frank Liberato <liberato@chromium.org>
Auto-Submit: Mounir Lamouri <mlamouri@chromium.org>
Commit-Queue: Mounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/heads/master@{#869771}

WATCHLISTS

@@ -71,14 +71,6 @@
       'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/.*ChooserDialog.java|'\
                   'chrome/android/javatests/src/org/chromium/chrome/browser/.*ChooserDialogTest.java'
     },
-    'android_media': {
-      'filepath': 'content/browser/media/android' \
-                  '|content/renderer/media/android' \
-                  '|media/audio/android' \
-                  '|media/base/android' \
-                  '|media/midi/*_android.*' \
-                  '|media/video/capture/android'
-    },
     'android_omnibox': {
       'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/omnibox/'
     },
@@ -276,10 +268,6 @@
     'blink_animation': {
       'filepath': 'third_party/(WebKit|blink)/.*([Aa]nimat|[Tt]ransition)',
     },
-    'blink_app_banner': {
-      'filepath': 'third_party/blink/renderer/modules/app_banner' \
-                  '|third_party/blink/public/platform/modules/app_banner',
-    },
     'blink_audio': {
       'filepath': 'third_party/blink/renderer/platform/audio' \
                   '|third_party/blink/renderer/modules/webaudio' \
@@ -518,10 +506,6 @@
     'blink_scheduling_api': {
       'filepath': 'third_party/blink/renderer/modules/scheduler'
     },
-    'blink_screen_orientation': {
-      'filepath': 'third_party/blink/renderer/modules/screen_orientation/' \
-                  '|third_party/blink/public/platform/modules/screen_orientation',
-    },
     'blink_script': {
       'filepath': 'third_party/blink/renderer/bindings/core/v8/.*module.*' \
                   '|third_party/blink/renderer/bindings/core/v8/script_controller.*' \
@@ -573,10 +557,6 @@
                   '|third_party/blink/renderer/core/css/mediaControl' \
                   '|third_party/blink/web_tests/media/track/'
     },
-    'blink_vibration': {
-      'filepath': 'third_party/blink/web_tests/vibration/' \
-                  '|third_party/blink/renderer/modules/vibration/'
-    },
     'blink_viewport_interaction': {
       'filepath': 'third_party/blink/renderer/core/css/.*viewport' \
                   '|third_party/blink/renderer/core/dom/viewport_arguments' \
@@ -838,9 +818,6 @@
                   'content/browser/loader|' \
                   'content/child/*loader',
     },
-    'content_renderer': {
-      'filepath': 'content/renderer/',
-    },
     'content_security_policy': {
       'filepath': 'content_security_policy|csp',
     },
@@ -1661,9 +1638,6 @@
       'filepath': 'ash/content/scanning/'\
                   '|chrome/browser/ash/scanning/',
     },
-    'screen_orientation': {
-      'filepath': 'screen_orientation',
-    },
     'security': {
       'filepath': 'base/json/'\
                   '|base/memory/.*shared_memory'\
@@ -2108,7 +2082,6 @@
     'android_infra': ['agrieve+watch@chromium.org'],
     'android_item_chooser_dialogs': ['juncai+watch@chromium.org',
                                      'ortuno+watch@chromium.org'],
-    'android_media': ['mlamouri+watch-media@chromium.org'],
     'android_omnibox': ['ender+watch@chromium.org',
                          'jinsukkim+watch@chromium.org'],
     'android_search_widget': ['tedchoc+watch@chromium.org',
@@ -2206,11 +2179,9 @@
     'blink_animation': ['alexis.menard@intel.com',
                         'gerchiko@microsoft.com',
                         'blink-reviews-animation@chromium.org'],
-    'blink_app_banner': ['mlamouri+watch-blink@chromium.org'],
     'blink_audio': ['hongchan@chromium.org',
                     'rtoy@chromium.org'],
-    'blink_battery_status': ['mlamouri+watch-blink@chromium.org',
+    'blink_battery_status': ['timvolodine@chromium.org'],
-                             'timvolodine@chromium.org'],
     'blink_bindings': ['blink-reviews-bindings@chromium.org', 'haraken@chromium.org'],
     'blink_bindings_serialization': ['jbroman+watch@chromium.org'],
     'blink_bluetooth': ['mattreynolds+watch@chromium.org',
@@ -2230,7 +2201,6 @@
                               'svillar@igalia.com'],
     'blink_custom_elements': ['dominicc+watchlist@chromium.org'],
     'blink_device_orientation': ['juncai+watch@chromium.org',
-                                 'mlamouri+watch-blink@chromium.org',
                                  'rijubrata.bhaumik@intel.com',
                                  'timvolodine@chromium.org'],
     'blink_devtools': ['devtools-reviews+blink@chromium.org'],
@@ -2270,18 +2240,15 @@
                      'loading-reviews@chromium.org'],
     'blink_media': ['feature-media-reviews@chromium.org',
                     'eric.carlson@apple.com',
-                    'mlamouri+watch-blink@chromium.org',
                     'srirama.m@samsung.com'],
     'blink_media_queries': ['kenneth.christiansen@gmail.com',
                             'yoavweiss@chromium.org'],
     'blink_mediastream': ['tommyw+watchlist@chromium.org'],
     'blink_navigator_content_utils': ['gyuyoung.kim@chromium.org'],
-    'blink_out_of_process_frames': ['dcheng@chromium.org',
+    'blink_out_of_process_frames': ['dcheng@chromium.org'],
-                                    'mlamouri+watch-blink@chromium.org'],
     'blink_paint' : ['blink-reviews-paint@chromium.org'],
     'blink_paintworklet' : ['xidachen@chromium.org'],
-    'blink_permissions': ['mlamouri+watch-blink@chromium.org',
+    'blink_permissions': ['permissions-reviews@chromium.org'],
-                          'permissions-reviews@chromium.org'],
     'blink_platform': ['kinuko+watch@chromium.org'],
     'blink_platform_graphics': ['blink-reviews-platform-graphics@chromium.org',
                                 'drott+blinkwatch@chromium.org',
@@ -2299,7 +2266,6 @@
     'blink_scheduler': ['chikamune+watch@chromium.org',
                         'scheduler-bugs+blink@chromium.org'],
     'blink_scheduling_api': ['web-scheduling-api-reviews@chromium.org'],
-    'blink_screen_orientation': ['mlamouri+watch-blink@chromium.org'],
     'blink_script': ['kouhei+script@chromium.org',
                      'hiroshige+script@chromium.org', 'dom+watch@chromium.org'],
     'blink_scroll': ['bokan@chromium.org'],
@@ -2325,7 +2291,6 @@
                     'glenn@chromium.org',
                     'silviapf@chromium.org',
                     'srirama.m@samsung.com'],
-    'blink_vibration': ['mlamouri+watch-blink@chromium.org'],
     'blink_viewport_interaction': ['kenneth.christiansen@gmail.com',
                                    'bokan@chromium.org'],
     'blink_w3ctests': ['blink-reviews-w3ctests@chromium.org'],
@@ -2437,12 +2402,10 @@
                           'ortuno+watch@chromium.org'],
     'content_index': ['rayankans+watch@chromium.org'],
     'content_loader': ['loading-reviews@chromium.org'],
-    'content_renderer': ['mlamouri+watch-content@chromium.org'],
     'content_security_policy':['antoniosartori+watch-csp@chromium.org',
                                'arthursonzogni+watch-csp@chromium.org',
                                'mkwst+watch-csp@chromium.org'],
-    'content_shell': ['mlamouri+watch-content@chromium.org',
+    'content_shell': ['peter@chromium.org'],
-                      'peter@chromium.org'],
     'content_worker': ['blink-worker-reviews@chromium.org',
                        'kinuko+watch@chromium.org'],
     'contextual_search': ['donnd+watch@chromium.org',
@@ -2603,7 +2566,6 @@
                           'rsesek+watch@chromium.org'],
     'mac' : ['mac-reviews@chromium.org'],
     'manifest': ['dominickn+watch-manifest@chromium.org',
-                 'mlamouri+watch-manifest@chromium.org',
                  'dmurph+watching-manifest@chromium.org',
                  'webappwatch@microsoft.com'],
     'media': ['feature-media-reviews@chromium.org'],
@@ -2713,7 +2675,6 @@
                    'teravest+watch@chromium.org',
                    'yusukes+watch@chromium.org'],
     'permissions': ['dominickn+watch-permissions@chromium.org',
-                    'mlamouri+watch-permissions@chromium.org',
                     'permissions-reviews@chromium.org'],
     'phonehub': ['hsuregan+watch-phonehub@chromium.org',
                  'khorimoto+watch-phonehub@chromium.org',
@@ -2751,7 +2712,6 @@
     'scanning': ['gavinwill+scanning-watch@chromium.org',
                  'jschettler+scanning-watch@chromium.org',
                  'zentaro+scanning-watch@chromium.org'],
-    'screen_orientation': ['mlamouri+watch-screen-orientation@chromium.org'],
     'security': ['security-watchlist@chromium.org'],
     'select_to_speak': ['katie+watch@chromium.org',
                         'anastasi+watch@google.com'],
@@ -2829,8 +2789,7 @@
                                  'davidjm+watch@chromium.org'],
     'tbmv2_metrics': ['speed-metrics-reviews@chromium.org'],
     'telemetry': ['telemetry-reviews@chromium.org'],
-    'test_runner': ['mlamouri+watch-test-runner@chromium.org',
+    'test_runner': ['einbinder+watch-test-runner@chromium.org'],
-                    'einbinder+watch-test-runner@chromium.org'],
     'tests': [],
     'tether': ['hansberry+watch-tether@chromium.org',
                'vecore+watch-tether@google.com'],

ash/media/OWNERS

@@ -1 +1 @@
-mlamouri@chromium.org
+steimel@chromium.org

chrome/android/java/src/org/chromium/chrome/browser/display_cutout/OWNERS

@@ -1 +0,0 @@
-mlamouri@chromium.org

chrome/android/java/src/org/chromium/chrome/browser/media/OWNERS

@@ -1 +0,0 @@
-mlamouri@chromium.org

chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS

@@ -1,6 +1,5 @@
 dominickn@chromium.org
 hartmanng@chromium.org
-mlamouri@chromium.org
 peconn@chromium.org
 peter@chromium.org
 pkotwicz@chromium.org

chrome/android/javatests/src/org/chromium/chrome/browser/media/OWNERS

@@ -1 +0,0 @@
-mlamouri@chromium.org

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/OWNERS

@@ -1,4 +1,3 @@
 dominickn@chromium.org
 hanxi@chromium.org
-mlamouri@chromium.org
 pkotwicz@chromium.org

chrome/android/junit/src/org/chromium/chrome/browser/media/ui/OWNERS

@@ -1 +0,0 @@
-mlamouri@chromium.org

chrome/browser/media/OWNERS

@@ -6,12 +6,6 @@ tommi@chromium.org
 per-file cast_*=mfoltz@chromium.org
 per-file cast_*=jophba@chromium.org
 
-# For Media Engagement
-per-file media_engagement*=mlamouri@chromium.org
-
-# For Unified Autoplay
-per-file unified_autoplay*=mlamouri@chromium.org
-
 # For IPC security review
 per-file *.mojom=set noparent
 per-file *.mojom=file://ipc/SECURITY_OWNERS

chrome/browser/permissions/OWNERS

@@ -1,3 +1,2 @@
 file://components/permissions/PERMISSIONS_OWNERS
 felt@chromium.org
-mlamouri@chromium.org

chrome/browser/resources/media/OWNERS

@@ -1,5 +0,0 @@
-# For Media Engagement
-mlamouri@chromium.org
-
-# For WebRTC
-per-file webrtc_*=file://third_party/webrtc_overrides/OWNERS

chrome/browser/ui/webui/media/OWNERS

@@ -1,5 +0,0 @@
-# For Media Engagement
-mlamouri@chromium.org
-
-# For WebRTC
-per-file webrtc_*=file://third_party/webrtc_overrides/OWNERS

chrome/renderer/media/OWNERS

@@ -5,8 +5,5 @@ tommi@chromium.org
 # ChromeSpeechRecognitionClient
 per-file chrome_speech_recognition_client*=evliu@google.com
 
-# FlashEmbedRewrite
-per-file flash_embed_rewrite*=mlamouri@chromium.org
-
 # For Media Feeds.
 per-file media_feeds*=file://chrome/browser/media/feeds/OWNERS

chrome/services/speech/OWNERS

@@ -1,3 +1,2 @@
 evliu@google.com
-mlamouri@chromium.org
 robsc@chromium.org

chrome/test/data/media/engagement/OWNERS

@@ -1 +0,0 @@
-mlamouri@chromium.org

components/browser_ui/display_cutout/OWNERS

@@ -1 +0,0 @@
-mlamouri@chromium.org

components/browser_ui/media/OWNERS

@@ -1 +0,0 @@
-mlamouri@chromium.org

components/media_router/browser/android/OWNERS

@@ -4,4 +4,3 @@ tguilbert@chromium.org
 
 # backup reviewers
 mfoltz@chromium.org
-mlamouri@chromium.org

components/webrtc/android/OWNERS

@@ -1 +0,0 @@
-mlamouri@chromium.org

content/browser/permissions/OWNERS

@@ -1,2 +1,2 @@
-mlamouri@chromium.org
+file://components/permissions/PERMISSIONS_OWNERS
 timvolodine@chromium.org

content/browser/presentation/OWNERS

@@ -1,3 +1,2 @@
 # Presentation API OWNERS
 mfoltz@chromium.org
-mlamouri@chromium.org

content/public/android/java/src/org/chromium/content/browser/OWNERS

@@ -1,11 +1,8 @@
 # Device Motion / Orientation API related
 per-file DeviceSensors.java=timvolodine@chromium.org
 
-# Screen Orientation API related
-per-file ScreenOrientation*.java=mlamouri@chromium.org
-
 # Media Session API related
-per-file AudioFocus*.java=mlamouri@chromium.org
+per-file AudioFocus*.java=steimel@chromium.org
 
 # Process management related
 per-file BindingManager*.java=jcivelli@chromium.org

content/public/android/javatests/src/org/chromium/content/browser/OWNERS

@@ -1,11 +1,8 @@
 # Device Motion / Orientation API related
 per-file DeviceSensorsTest.java=timvolodine@chromium.org
 
-# Screen Orientation API related
-per-file ScreenOrientation*.java=mlamouri@chromium.org
-
 # Media Session API related
-per-file MediaSession*.java=mlamouri@chromium.org
+per-file MediaSession*.java=steimel@chromium.org
 
 # Java Bridge
 per-file JavaBridge*=michaelbai@chromium.org

content/public/test/android/javatests/src/org/chromium/content_public/browser/test/util/OWNERS

@@ -1,3 +0,0 @@
-# Screen Orientation API related
-per-file MockOrientationObserver.java=mlamouri@chromium.org
-per-file OrientationChangeObserverCriteria.java=mlamouri@chromium.org

docs/user_handle_mapping.md

@@ -71,7 +71,6 @@ For Chromium contributors that have different nicks on other domains.
 | mmeade            | mmeade          | mmeade          |
 | mednik            | mednik          | mednik          |
 | mgaba             | mgaba           | mgaba           |
-| mlamouri          | mounir          | mlamouri        |
 | mlinck            | dullb0yj4ck     | mlinck          |
 | msw               | msw\_           | msw             |
 | nick              | nickcarter      | ncarter         |

media/base/OWNERS

@@ -1,3 +1 @@
 per-file *audio*=file://media/audio/OWNERS
-
-per-file media_switches.*=mlamouri@chromium.org

services/device/screen_orientation/OWNERS

@@ -1,2 +1 @@
 blundell@chromium.org
-mlamouri@chromium.org

services/media_session/OWNERS

@@ -1 +1 @@
-mlamouri@chromium.org
+steimel@chromium.org

third_party/android_media/OWNERS

@@ -1 +1 @@
-mlamouri@chromium.org
+liberato@chromium.org

third_party/blink/public/mojom/permissions/OWNERS

@@ -1,4 +1,4 @@
-mlamouri@chromium.org
+file://third_party/blink/renderer/modules/permissions/OWNERS
 
 per-file *.mojom=set noparent
 per-file *.mojom=file://ipc/SECURITY_OWNERS

third_party/blink/public/platform/OWNERS

@@ -8,15 +8,12 @@ per-file *.typemap=file://ipc/SECURITY_OWNERS
 
 per-file web_graphics_context_3d_provider.h=kbr@chromium.org
 per-file web_rtc_*=hbos@chromium.org
-per-file web_media_player*=mlamouri@chromium.org
 
 # Video SurfaceLayer functionality.
 per-file web_video_frame*=file://media/OWNERS
 per-file webaudiosourceprovider_impl.h=file://media/OWNERS
-per-file web_video_frame*=mlamouri@chromium.org
 per-file web_video_frame*=lethalantidote@chromium.org
 per-file web_surface_layer_bridge*=file://media/OWNERS
-per-file web_surface_layer_bridge*=mlamouri@chromium.org
 per-file web_surface_layer_bridge*=lethalantidote@chromium.org
 
 # Any core owner can also approve changes to runtime-enabled features.

third_party/blink/renderer/core/html/media/OWNERS

@@ -1 +1 @@
-mlamouri@chromium.org
+dalecurtis@chromium.org

third_party/blink/renderer/modules/OWNERS

@@ -3,7 +3,6 @@ haraken@chromium.org
 jbroman@chromium.org
 kinuko@chromium.org
 mkwst@chromium.org
-mlamouri@chromium.org
 
 # Reviewers for inspector-related code:
 dgozman@chromium.org

third_party/blink/renderer/modules/app_banner/OWNERS

@@ -1,5 +1,4 @@
 cmp@chromium.org
 dmurph@chromium.org
 dominickn@chromium.org
-mlamouri@chromium.org
 msw@chromium.org

third_party/blink/renderer/modules/manifest/OWNERS

@@ -2,7 +2,6 @@ cmp@chromium.org
 dmurph@chromium.org
 dominickn@chromium.org
 mgiuca@chromium.org
-mlamouri@chromium.org
 msw@chromium.org
 
 per-file *_type_converter*.*=set noparent

third_party/blink/renderer/modules/media_capabilities/OWNERS

@@ -1 +1 @@
-mlamouri@chromium.org
+chcunningham@chromium.org

third_party/blink/renderer/modules/media_controls/OWNERS

@@ -1,2 +1 @@
-mlamouri@chromium.org
 steimel@chromium.org

third_party/blink/renderer/modules/mediasession/OWNERS

@@ -1,5 +1,5 @@
 foolip@chromium.org
-mlamouri@chromium.org
+steimel@chromium.org
 
 per-file *_mojom_traits*.*=set noparent
 per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS

third_party/blink/renderer/modules/permissions/OWNERS

@@ -1 +1 @@
-mlamouri@chromium.org
+file://components/permissions/PERMISSIONS_OWNERS

third_party/blink/renderer/modules/picture_in_picture/OWNERS

@@ -1,2 +1 @@
 beaufort.francois@gmail.com
-mlamouri@chromium.org

third_party/blink/renderer/modules/presentation/OWNERS

@@ -1,2 +1 @@
 mfoltz@chromium.org
-mlamouri@chromium.org

third_party/blink/renderer/modules/remoteplayback/OWNERS

@@ -1,2 +1,2 @@
-mlamouri@chromium.org
+mfoltz@chromium.org
-
+tguilbert@chromium.org

third_party/blink/renderer/modules/screen_orientation/OWNERS

@@ -1,4 +0,0 @@
-mlamouri@chromium.org
-
-per-file *.mojom=set noparent
-per-file *.mojom=file://ipc/SECURITY_OWNERS

third_party/blink/renderer/modules/wake_lock/OWNERS

@@ -1,3 +1,2 @@
-mlamouri@chromium.org
 raphael.kubo.da.costa@intel.com
 reillyg@chromium.org

third_party/blink/renderer/modules/webcodecs/OWNERS

@@ -1,6 +1,5 @@
-mlamouri@chromium.org
 sandersd@chromium.org
 dalecurtis@chromium.org
 chcunningham@chromium.org
 tguilbert@chromium.org
-eugene@chromium.org
+eugene@chromium.org

third_party/blink/renderer/platform/graphics/OWNERS

@@ -20,8 +20,6 @@ mcasas@chromium.org
 
 # Video SurfaceLayer functionality.
 per-file video_frame*=file://media/OWNERS
-per-file video_frame*=mlamouri@chromium.org
 per-file video_frame*=lethalantidote@chromium.org
 per-file surface_layer_bridge*=file://media/OWNERS
-per-file surface_layer_bridge*=mlamouri@chromium.org
 per-file surface_layer_bridge*=lethalantidote@chromium.org

third_party/blink/web_tests/external/wpt/mediasession/OWNERS

@@ -1 +1 @@
-mlamouri@chromium.org
+file://third_party/blink/renderer/modules/mediasession/OWNERS

third_party/blink/web_tests/external/wpt/remote-playback/OWNERS

@@ -1 +1 @@
-mlamouri@chromium.org
+tguilbert@chromium.org

third_party/blink/web_tests/external/wpt/screen-orientation/OWNERS

@@ -1 +0,0 @@
-mlamouri@chromium.org

third_party/google-closure-library/OWNERS

@@ -1,2 +1 @@
-mlamouri@chromium.org
 steimel@chromium.org

tools/android/audio_focus_grabber/OWNERS

@@ -1,2 +1 @@
-mlamouri@chromium.org
 zqzhang@chromium.org

tools/media_engagement_preload/OWNERS

@@ -1 +1 @@
-mlamouri@chromium.org
+liberato@chromium.org

tools/metrics/actions/actions.xml

@@ -4724,7 +4724,8 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="ClearBrowsingData_SiteUsageData">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
   <description>Recorded when the user clears site usage data.</description>
 </action>
 
@@ -12562,12 +12563,14 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="Media.Controls.Cast">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
   <description>The user clicked on the cast controls button.</description>
 </action>
 
 <action name="Media.Controls.CastOverlay">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
   <description>The user clicked on the cast overlay button.</description>
 </action>
 
@@ -12586,24 +12589,28 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="Media.Controls.ClosedCaptionHide">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
   <description>The user hid the closed caption from the controls.</description>
 </action>
 
 <action name="Media.Controls.ClosedCaptionShow">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
   <description>
     The user showed the closed caption from the controls.
   </description>
 </action>
 
 <action name="Media.Controls.Download">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
   <description>The user clicked on the controls' download button.</description>
 </action>
 
 <action name="Media.Controls.EnterFullscreen">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
   <description>The user entered fullscreen mode from the controls.</description>
 </action>
 
@@ -12617,7 +12624,8 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="Media.Controls.ExitFullscreen">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
   <description>The user left fullscreen mode from the controls.</description>
 </action>
 
@@ -12631,27 +12639,31 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="Media.Controls.Mute">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
   <description>The user muted a media element from the controls.</description>
 </action>
 
 <action name="Media.Controls.OverflowClose">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
   <description>The user closed the overflow menu via the controls.</description>
 </action>
 
 <action name="Media.Controls.OverflowOpen">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
   <description>The user opened the overflow menu via the controls.</description>
 </action>
 
 <action name="Media.Controls.Pause">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
   <description>The user paused a media element from the controls.</description>
 </action>
 
 <action name="Media.Controls.PauseOverlay">
-  <owner>beccahughes@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <description>
     The user paused a media element from the pause overlay button.
@@ -12659,12 +12671,14 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="Media.Controls.Play">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
   <description>The user played a media element from the controls.</description>
 </action>
 
 <action name="Media.Controls.PlayOverlay">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
   <description>
     The user played a media element from the play overlay button.
   </description>
@@ -12687,6 +12701,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="Media.Controls.RemoteSeekBackward">
+  <owner>steimel@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <description>
     User seeks the video backward using any controls apart from the media
@@ -12696,6 +12711,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="Media.Controls.RemoteSeekForward">
+  <owner>steimel@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <description>
     User seeks the video forward using any controls apart from the media element
@@ -12704,33 +12720,38 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="Media.Controls.ScrubbingBegin">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
   <description>
     The user started to interact with the control's scrubber.
   </description>
 </action>
 
 <action name="Media.Controls.ScrubbingEnd">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
   <description>
     The user stopped interacting with the control's scrubber.
   </description>
 </action>
 
 <action name="Media.Controls.Unmute">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
   <description>The user unmuted a media element from the controls.</description>
 </action>
 
 <action name="Media.Controls.VolumeChangeBegin">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
   <description>
     The user started to interact with the control's volume slider.
   </description>
 </action>
 
 <action name="Media.Controls.VolumeChangeEnd">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
   <description>
     The user stopped interacting with the control's volume slider.
   </description>
@@ -12880,7 +12901,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MediaContextMenu_EnterPictureInPicture">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <description>
     User clicked on the contextual menu of a video player to enter
@@ -12889,7 +12910,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MediaContextMenu_ExitPictureInPicture">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <description>
     User clicked on the contextual menu of a video player to exit
@@ -21130,8 +21151,8 @@ should be able to be added at any place in this file.
 
 <action name="ScreenOrientationChange">
   <owner>avayvod@chromium.org</owner>
-  <owner>mlamouri@chromium.org</owner>
   <owner>zqzhang@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
   <description>
     The use rotates the device triggering a screen orientation change. This
     action is Android-specific.
@@ -22725,7 +22746,6 @@ should be able to be added at any place in this file.
 <action name="Signin_Impression_FromKaleidoscope">
   <owner>beccahughes@chromium.org</owner>
   <owner>steimel@chromium.org</owner>
-  <owner>mlamouri@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <description>
     Recorded when showing a sign-in page from Kaleidoscope.
@@ -27389,7 +27409,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="webapps.AddShortcut.Manifest">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>mgiuca@chromium.org</owner>
   <description>
     Shortcut added to the homescreen with a valid Manifest. This action will be
     recorded in addition to AppShortcut, AppShortcutApple and Bookmark actions

tools/metrics/histograms/histograms_xml/media/histograms.xml

@@ -137,7 +137,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Media.Audio.Autoplay" enum="AutoplaySource"
     expires_after="2021-08-01">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>dalecurtis@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>Records the autoplay source of audios.</summary>
 </histogram>
@@ -1146,7 +1146,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Media.Capabilities.DecodingInfo.Time.Video" units="ms"
     expires_after="2021-07-27">
   <owner>chcunningham@chromium.org</owner>
-  <owner>mlamouri@google.com</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
     Time spent between receiving a decodingInfo() call and resolving it. It only
@@ -1157,7 +1156,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Media.Capabilities.DecodingInfo.Time.Video.Clear" units="ms"
     expires_after="2021-08-09">
   <owner>chcunningham@chromium.org</owner>
-  <owner>mlamouri@google.com</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
     Time spent between receiving a decodingInfo() call and resolving it. It only
@@ -1170,7 +1168,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Media.Capabilities.DecodingInfo.Time.Video.Encrypted"
     units="ms" expires_after="2021-01-15">
   <owner>chcunningham@chromium.org</owner>
-  <owner>mlamouri@google.com</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
     Time spent between receiving a decodingInfo() call and resolving it. It only
@@ -1234,7 +1231,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Media.Controls.Show.Audio" enum="MediaControlsShowReason"
     expires_after="2021-08-01">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
   <summary>
     Record whether the default media controls of an audio element were shown and
     why every time they could be shown. Note that audio elements that were not
@@ -1245,7 +1243,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Media.Controls.Show.Video" enum="MediaControlsShowReason"
     expires_after="2021-08-01">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
   <summary>
     Record whether the default media controls of a video element were shown and
     why every time they could be shown.
@@ -3440,7 +3439,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Media.Session.ActiveTime" units="ms"
     expires_after="2021-08-01">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
     Time during which a media session has been active, in other words, the time
@@ -3453,7 +3452,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Media.Session.Pause" enum="MediaSessionActionSource"
     expires_after="2021-08-01">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
     The number of times the user paused playback of a media session using other
@@ -3463,7 +3462,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Media.Session.Play" enum="MediaSessionActionSource"
     expires_after="2021-08-01">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
     The number of times the user started playback of a media session using other
@@ -3473,7 +3472,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Media.Session.RequestAudioFocusResult" enum="BooleanSuccess"
     expires_after="2021-08-01">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
     Indicate whether the native requestAudioFocus() call was successful.
@@ -3482,7 +3481,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Media.Session.Stop" enum="MediaSessionActionSource"
     expires_after="2021-08-01">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
     The number of times the user stopped a media session using other means than
@@ -3492,7 +3491,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Media.Session.Suspended" enum="MediaSessionSuspendedSource"
     expires_after="2021-08-01">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
     The number of times a media session is suspended and why it has been
@@ -3787,7 +3786,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Media.Video.Autoplay" enum="AutoplaySource"
     expires_after="2021-08-01">
-  <owner>mlamouri@google.com</owner>
+  <owner>dalecurtis@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
     Records the autoplay source of videos. This includes
@@ -3797,14 +3796,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Media.Video.Autoplay.Muted" enum="AutoplaySource"
     expires_after="2021-06-01">
-  <owner>mlamouri@google.com</owner>
+  <owner>dalecurtis@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>Records the autoplay source of muted videos.</summary>
 </histogram>
 
 <histogram name="Media.Video.Autoplay.Muted.PlayMethod.BecomesVisible"
     enum="Boolean" expires_after="2021-08-01">
-  <owner>mlamouri@google.com</owner>
+  <owner>dalecurtis@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
     Records muted video started playing with play() become visible at some
@@ -3817,7 +3816,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Media.Video.Autoplay.Muted.PlayMethod.OffscreenDuration"
     units="ms" expires_after="2021-08-01">
-  <owner>mlamouri@google.com</owner>
+  <owner>dalecurtis@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
     Records the offscreen playing duration of a muted video autoplaying from
@@ -3827,7 +3826,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Media.Video.Autoplay.Muted.UnmuteAction" enum="BooleanSuccess"
     expires_after="2021-08-01">
-  <owner>mlamouri@google.com</owner>
+  <owner>dalecurtis@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
     Status of the unmute action on a video that autoplayed because it was muted.
@@ -4404,7 +4403,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Media.VideoPersistence.AttemptResult"
     enum="VideoPersistenceAttemptResult" expires_after="2021-09-19">
-  <owner>mlamouri@google.com</owner>
   <owner>peconn@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -4415,7 +4413,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Media.VideoPersistence.ControlsType"
     enum="VideoPersistenceControlsType" expires_after="2021-09-19">
-  <owner>mlamouri@google.com</owner>
+  <owner>peconn@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
     Record the type of controls a persisted video is using. This is recorded
@@ -4425,7 +4423,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Media.VideoPersistence.Duration" units="ms"
     expires_after="M93">
-  <owner>mlamouri@google.com</owner>
   <owner>peconn@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -4436,7 +4433,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Media.VideoPersistence.EndReason"
     enum="VideoPersistenceEndReason" expires_after="2021-09-19">
-  <owner>mlamouri@google.com</owner>
   <owner>peconn@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>

tools/metrics/histograms/histograms_xml/others/histograms.xml

@@ -9374,7 +9374,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Manifest.FetchResult" enum="ManifestFetchResultType"
     expires_after="2020-12-13">
   <owner>mgiuca@chromium.org</owner>
-  <owner>mlamouri@chromium.org</owner>
   <summary>
     Tracks whether the Manifest fetch succeed and why it failed if it failed.
   </summary>
@@ -9383,7 +9382,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Manifest.HasProperty" enum="Boolean"
     expires_after="2021-08-09">
   <owner>mgiuca@chromium.org</owner>
-  <owner>mlamouri@chromium.org</owner>
   <summary>
     Tracks which properties of a Manifest were present when it was parsed. If a
     property can't be parsed, it will be recorded as not present. These
@@ -9395,7 +9393,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Manifest.ParseSuccess" enum="Boolean"
     expires_after="2020-06-07">
   <owner>mgiuca@chromium.org</owner>
-  <owner>mlamouri@chromium.org</owner>
   <summary>
     Tracks the Manifest parsing result. A failure will be recorded if the
     Manifest was incorrectly structured. This doesn't take into account parse
@@ -18973,7 +18970,6 @@ regressions. -->
 
 <histogram name="XR.RuntimeUsed" enum="XRDeviceId" expires_after="2021-07-01">
   <owner>alcooper@chromium.org</owner>
-  <owner>mlamouri@google.com</owner>
   <owner>xr-dev@chromium.org</owner>
   <summary>
     Indicates which XR runtime was used for a session. Recorded when the session

tools/metrics/histograms/histograms_xml/web_audio/histograms.xml

@@ -153,10 +153,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="WebAudio.Autoplay" enum="WebAudioAutoplayStatus"
     expires_after="2021-08-09">
-  <owner>mlamouri@google.com</owner>
+  <owner>hongchan@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <owner>rtoy@chromium.org</owner>
-  <owner>hongchan@chromium.org</owner>
   <summary>
     The autoplay status of an AudioContext when destroyed. This include all
     types of frames. In order to know the value only for main frames, the
@@ -166,10 +165,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="WebAudio.Autoplay.CrossOrigin" enum="WebAudioAutoplayStatus"
     expires_after="2021-08-01">
-  <owner>mlamouri@google.com</owner>
+  <owner>hongchan@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <owner>rtoy@chromium.org</owner>
-  <owner>hongchan@chromium.org</owner>
   <summary>
     The autoplay status of an AudioContext when destroyed in a cross-origin
     frame.
@@ -178,10 +176,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="WebAudio.Autoplay.UnlockType"
     enum="WebAudioAutoplayUnlockType" expires_after="2021-06-01">
-  <owner>mlamouri@google.com</owner>
+  <owner>hongchan@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <owner>rtoy@chromium.org</owner>
-  <owner>hongchan@chromium.org</owner>
   <summary>
     Records how an AudioContext was unlocked (if it was). This is recorded when
     the AudioContext is destroyed.

tools/metrics/ukm/ukm.xml

@@ -7875,7 +7875,7 @@ be describing additional metrics about the same event.
 </event>
 
 <event name="Media.Autoplay.Attempt">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>dalecurtis@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
     Event recorded when there is an attempt to autoplay (ie. no user gesture).
@@ -7925,7 +7925,7 @@ be describing additional metrics about the same event.
 </event>
 
 <event name="Media.Autoplay.AudioContext">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>dalecurtis@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
     Records the AudioContext autoplay information.
@@ -7952,7 +7952,7 @@ be describing additional metrics about the same event.
 </event>
 
 <event name="Media.Autoplay.Muted.UnmuteAction">
-  <owner>mlamouri@chromium.org</owner>
+  <owner>dalecurtis@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
     Event recorded when there is an attempt to unmute an media that was