BASELINE: Update Chromium to 55.0.2883.105

And updates ninja to 1.7.2

Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

1 files changed, 482 insertions, 350 deletions

diff --git a/chromium/WATCHLISTS b/chromium/WATCHLISTS
index 5e78139249c..e3394fe1f43 100644
--- a/chromium/WATCHLISTS
+++ b/chromium/WATCHLISTS
@@ -37,6 +37,9 @@
                   'chrome/browser/android/shortcut_.*|'\
                   'chrome/browser/android/webapps/',
     },
+    'android_crash_reporting': {
+      'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/crash/'
+    },
     'android_crazy_linker': {
       'filepath': 'third_party/android_crazy_linker/'
     },
@@ -48,6 +51,9 @@
                   '|testing/android/' \
                   '|tools/android/'
     },
+    'android_java': {
+      'filepath': '/java/'
+    },
     'android_loading': {
       'filepath': 'tools/android/loading/'
     },
@@ -62,6 +68,12 @@
     'android_tab': {
       'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/Tab'
     },
+    'android_uma_settings': {
+      'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/UsageAndCrashReportsPreferenceFragment.java|'\
+                  'chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java|'\
+                  'chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java|'\
+                  'chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java',
+    },
     'android_webview': {
       'filepath': 'android_webview/',
     },
@@ -161,7 +173,6 @@
     },
     'battery_status': {
       'filepath': 'content/browser/battery_status/|'\
-                  'content/renderer/battery_status/|'\
                   'content/test/data/battery_status/|'\
                   'device/battery/',
     },
@@ -178,6 +189,9 @@
                   '|chrome/browser/ui/views/bookmarks/' \
                   '|components/bookmarks'
     },
+    'bottombar': {
+      'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/',
+    },
     'breakpad_app': {
       'filepath': 'components/crash/content/app/',
     },
@@ -273,6 +287,9 @@
     'chromeos_dbus': {
       'filepath': 'chromeos/dbus/',
     },
+    'chromeos_geolocation': {
+      'filepath': 'chromeos/geolocation/',
+    },
     'chromeos_login': {
       'filepath': 'chrome/browser/chromeos/login/|'\
                   'chrome/browser/ui/webui/chromeos/login/|'\
@@ -291,6 +308,9 @@
                   'chromeos/dbus/power_.*|'\
                   'chrome/browser/chromeos/power/',
     },
+    'chromeos_timezone': {
+      'filepath': 'chromeos/timezone/',
+    },
     'chromeos_webui': {
       'filepath': 'chrome/browser/ui/webui/chromeos/|'\
                   'chrome/browser/resources/chromeos/',
@@ -298,13 +318,6 @@
     'clang_update': {
       'filepath': 'tools/clang/scripts/update.py'
     },
-    'clank_uma_settings': {
-      'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/UsageAndCrashReportsPreferenceFragment.java|'\
-                  'chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java|'\
-                  'chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java|'\
-                  'chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/CrashDumpUploadPreference.java|'\
-                  'chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java',
-    },
     'clipboard': {
       'filepath': 'clipboard|dnd|drag|drop',
     },
@@ -322,7 +335,8 @@
       'filepath': 'content/.*bluetooth'
     },
     'content_loader': {
-      'filepath': 'content/browser/loader|'\
+      'filepath': 'chrome/browser/loader|' \
+                  'content/browser/loader|' \
                   'content/child/*loader',
     },
     'content_renderer': {
@@ -334,6 +348,12 @@
     'content_worker': {
       'filepath': 'content/.*worker',
     },
+    'contextual_search': {
+      'filepath': 'chrome/browser/android/contextualsearch/|' \
+                  'chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/|' \
+                  'chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/|' \
+                  'components/contextual_search/',
+    },
     'cookie_monster': {
       'filepath': 'net/cookies/|'\
                   'chrome/browser/net/sqlite_persistent_cookie_store',
@@ -348,6 +368,11 @@
       'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/customtabs/|'\
                   'chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/',
     },
+    'data_reduction_proxy': {
+      'filepath': 'chrome/browser/net/spdyproxy/|'\
+                  'data_reduction_proxy|'\
+                  'chrome_proxy',
+    },
     'deep_memory_profiler': {
       'filepath': 'tools/(deep_memory_profiler|find_runtime_symbols)',
     },
@@ -359,7 +384,9 @@
                   'content/common/device_sensors/|'\
                   'content/public/android/java/src/org/chromium/content/browser/DeviceSensors.java|'\
                   'content/public/android/javatests/src/org/chromium/content/browser/DeviceSensorsTest.java|'\
-                  'content/renderer/device_sensors/',
+                  'content/renderer/device_sensors/|'\
+                  'content/test/data/device_sensors/|'\
+                  'device/sensors/',
     },
     'developer_recommended_flags': {
       'filepath': 'developer_recommended_flags.gypi',
@@ -414,11 +441,26 @@
                   'filebrowse'
     },
     'filesapp': {
+      'filepath': 'chrome/browser/chromeos/drive|' \
+                  'chrome/browser/chromeos/extensions/file_manager|' \
+                  'chrome/browser/chromeos/extensions/file_system_provider|' \
+                  'chrome/browser/chromeos/file_manager|' \
+                  'chrome/browser/chromeos/file_system_provider|' \
+                  'chrome/browser/drive|' \
+                  'chrome/test/data/extensions/api_test/file_system_provider|' \
+                  'components/drive|' \
+                  'google_apis/drive|' \
+                  'ui/file_manager'
+    },
+    'filesapp_ui': {
       'filepath': 'ui/file_manager'
     },
     'ftp': {
       'filepath': 'ftp',
     },
+    'fuzzing': {
+      'filepath': 'fuzz|Fuzz',
+    },
     'gcm': {
       'filepath': 'chrome/browser/services/gcm/|'\
                   'components/gcm_driver/|'\
@@ -457,7 +499,7 @@
     },
     'i18n': {
       'filepath': 'base/i18n/|base/string|l10n|icu|'\
-        'locale_settings|encoding',
+                  'locale_settings|encoding',
     },
     'importer': {
       'filepath': 'import',
@@ -557,6 +599,7 @@
     },
     'metrics': {
       'filepath': 'base/metrics/'\
+                  '|chrome/android/java/src/org/chromium/chrome/browser/metrics/'\
                   '|chrome/browser/metrics/'\
                   '|chrome/browser/chromeos/external_metrics'\
                   '|chrome/browser/extensions/api/metrics_private/'\
@@ -585,7 +628,7 @@
       'filepath': 'mouse_lock',
     },
     'mus': {
-      'filepath': 'components/mus/'\
+      'filepath': 'services/ui/'\
                   '|mojo/gpu/',
     },
     'nacl': {
@@ -632,6 +675,9 @@
         'content/renderer/notification_|' \
         'ui/message_center/'
     },
+    'nqe': {
+      'filepath': 'nqe',
+    },
     'ntp': {
       'filepath': 'chrome/browser/resources/ntp4/|'\
         'chrome/browser/resources/ntp_android/|'\
@@ -640,6 +686,7 @@
     'ntp_snippets': {
       'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/ntp/|'\
         'chrome/android/javatests/src/org/chromium/chrome/browser/ntp/|'\
+        'chrome/android/junit/src/org/chromium/chrome/browser/ntp/|'\
         'chrome/browser/android/ntp/ntp_snippets|'\
         'chrome/browser/ntp_snippets/|'\
         'chrome/browser/resources/snippets_internals|'\
@@ -648,6 +695,12 @@
         'chrome/android/java/res/layout/new_tab_page|'\
         'chrome/android/java/res/layout/most_visited'
     },
+    'ntp_tiles': {
+      'filepath': 'chrome/browser/android/ntp/|'\
+        'chrome/browser/ui/webui/ntp/|'\
+        'chrome/common/search/ntp|'\
+        'components/ntp_tiles/'
+    },
     'offline_pages': {
       'filepath': 'components/offline_pages/'\
                   '|chrome/browser/android/offline_pages/'\
@@ -672,7 +725,9 @@
         'ui/gl/gl_.*ozone.*'
     },
     'page_load_metrics' : {
-      'filepath': 'components/page_load_metrics/'
+      'filepath': 'chrome/browser/page_load_metrics/'\
+                  '|chrome/common/page_load_metrics/'\
+                  '|chrome/renderer/page_load_metrics/'
     },
     'panels': {
       'filepath': 'chrome/browser/ui/panels'\
@@ -783,12 +838,10 @@
     },
     'spellcheck': {
       'filepath': 'chrome/browser/spellchecker/'\
-                   '|chrome/browser/tab_contents/spellchecker'\
-                   '|chrome/browser/tab_contents/spelling_menu'\
-                   '|chrome/common/spellcheck_'\
-                   '|chrome/renderer/spellchecker/'\
-                   '|third_party/hunspell/'\
-                   '|third_party/hunspell_dictionaries/'\
+                  '|chrome/browser/renderer_context_menu/spelling_'\
+                  '|components/spellcheck/'\
+                  '|third_party/hunspell/'\
+                  '|third_party/hunspell_dictionaries/',
     },
     'streams': {
       'filepath': 'content/browser/streams/',
@@ -810,17 +863,13 @@
                   '|^chrome/android/java/src/org/chromium/chrome/browser/sync/'\
                   '|^chrome/browser/sync/'\
                   '|^components/browser_sync/'\
+                  '|^components/sync/'\
                   '|^components/sync_bookmarks/'\
-                  '|^components/sync_driver/'\
-                  '|^components/sync_sessions/'\
-                  '|^sync/',
+                  '|^components/sync_sessions/',
     },
     'syncfs': {
       'filepath': 'sync_file_system',
     },
-    'sync_proto': {
-      'filepath': 'sync/protocol/',
-    },
     'tab_capture': {
       'filepath': 'cc/output/copy_output_request'\
         '|chrome/browser/extensions/api/tab_capture/'\
@@ -905,6 +954,9 @@
                   'ui/compositor/layer_unittest|'\
                   'ui/compositor/compositor',
     },
+    'ui_display_win': {
+      'filepath': '^ui/display/win',
+    },
     'ui_resources': {
       'filepath': 'ui/resources/'\
                   '|ui/base/native_theme/resources/'\
@@ -1004,6 +1056,9 @@
     'blink_bindings': {
       'filepath': 'third_party/WebKit/Source/bindings',
     },
+    'blink_bindings_serialization': {
+      'filepath': 'third_party/WebKit/Source/bindings/(core|modules)/v8/.*[Ss]erializ',
+    },
     'blink_bluetooth': {
       'filepath': 'third_party/WebKit/.*[Bb]luetooth'
     },
@@ -1149,6 +1204,9 @@
       'filepath': 'third_party/WebKit/Source/core/layout' \
                   '|third_party/WebKit/Source/core/rendering'
     },
+    'blink_layout_ng': {
+      'filepath': 'third_party/WebKit/Source/core/layout/ng',
+    },
     'blink_layers': {
       'filepath': 'third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator' \
                   '|third_party/WebKit/Source/platform/graphics/GraphicsLayer' \
@@ -1258,9 +1316,6 @@
     'blink_serviceworkers_tests' : {
       'filepath': 'third_party/WebKit/LayoutTests/http/tests/serviceworker'
     },
-    'blink_sheriff_o_matic' : {
-      'filepath': 'third_party/WebKit/Tools/GardeningServer'
-    },
     'blink_spellcheck' : {
       'filepath': 'third_party/WebKit/Source/core/editing/spellcheck'
     },
@@ -1330,6 +1385,9 @@
     },
   },
 
+  ##############################################################################
+  # Please keep alphabetical
+  ##############################################################################
   'WATCHLISTS': {
     'about_flags': ['asvitkine+watch@chromium.org'],
     'accelerator_table': ['derat+watch@chromium.org',
@@ -1341,23 +1399,33 @@
                       'nektar+watch@chromium.org',
                       'yuzo+watch@chromium.org'],
     'activity_log': ['felt@chromium.org'],
-    'add_to_homescreen': ['dominickn+watch@chromium.org'],
+    'add_to_homescreen': ['agrieve+watch@chromium.org',
+                          'dominickn+watch@chromium.org',
+                          'pkotwicz+watch@chromium.org',
+                          'zpeng+watch@chromium.org'],
+    'android_crash_reporting': ['asvitkine+watch@chromium.org'],
     'android_crazy_linker': ['johnmaguire+watch@google.com'],
     'android_infobars': ['dfalcantara+watch@chromium.org'],
-    'android_infra': ['jbudorick+watch@chromium.org',
+    'android_infra': ['agrieve+watch@chromium.org',
+                      'jbudorick+watch@chromium.org',
                       'mikecase+watch@chromium.org'],
+    'android_java': ['agrieve+watch@chromium.org'],
     'android_loading': ['gabadie+watch@chromium.org',
                         'lizeb+watch-android-loading@chromium.org'],
     'android_media': ['avayvod+watch@chromium.org',
                       'mlamouri+watch-media@chromium.org'],
-    'android_tab': ['avayvod+watch@chromium.org', 'dtrainor@chromium.org'],
+    'android_tab': ['avayvod+watch@chromium.org',
+                    'dtrainor@chromium.org'],
+    'android_uma_settings': ['asvitkine+watch@chromium.org',
+                             'gayane+watch@chromium.org'],
     'android_webview': ['android-webview-reviews@chromium.org'],
-    'app_list': ['tfarina@chromium.org',
-                 'mgiuca@chromium.org',
-                 'tapted@chromium.org'],
-    'app_shortcuts': ['mgiuca@chromium.org', 'tapted@chromium.org'],
+    'app_list': ['mgiuca@chromium.org',
+                 'tfarina@chromium.org'],
+    'app_shortcuts': ['mgiuca@chromium.org',
+                      'tapted@chromium.org'],
     'appcache': ['michaeln@chromium.org'],
-    'apps': ['tfarina@chromium.org', 'chromium-apps-reviews@chromium.org'],
+    'apps': ['chromium-apps-reviews@chromium.org',
+             'tfarina@chromium.org'],
     'arc': ['elijahtaylor+arcwatch@chromium.org',
             'hidehiko+watch@chromium.org',
             'lhchavez+watch@chromium.org',
@@ -1366,35 +1434,41 @@
                 'cernekee@chromium.org',
                 'snanda@chromium.org'],
     'arc_power': ['ejcaruso+watch@chromium.org'],
-    'ash': ['sadrul@chromium.org',
-            'kalyan.kondapally@intel.com'],
-    'aura': ['sadrul@chromium.org',
-             'kalyan.kondapally@intel.com'],
+    'ash': ['kalyan.kondapally@intel.com',
+            'sadrul@chromium.org'],
+    'aura': ['kalyan.kondapally@intel.com',
+             'sadrul@chromium.org'],
     'aura_compositor': ['danakj+watch@chromium.org',
                         'jbauman+watch@chromium.org',
+                        'kalyan.kondapally@intel.com',
                         'piman+watch@chromium.org',
-                        'sievers+watch@chromium.org',
-                        'kalyan.kondapally@intel.com'],
+                        'sievers+watch@chromium.org'],
     'auto_bisect': ['auto-bisect-reviews@chromium.org'],
     'autofill': ['estade+watch@chromium.org',
                  'jdonnelly+autofillwatch@chromium.org',
                  'rouslan+autofill@chromium.org',
                  'vabr+watchlistautofill@chromium.org'],
     'automation': ['robertshield@chromium.org'],
-    'background_sync': ['jkarlin+watch@chromium.org','peter@chromium.org',
+    'background_sync': ['chasej+watch@chromium.org',
                         'iclelland+watch@chromium.org',
-                        'chasej+watch@chromium.org'],
-    'banners': ['dominickn+watch@chromium.org'],
+                        'jkarlin+watch@chromium.org',
+                        'peter@chromium.org'],
+    'banners': ['dominickn+watch@chromium.org',
+                'pkotwicz+watch@chromium.org',
+                'zpeng+watch@chromium.org'],
     'base_allocator': ['dmikurube@chromium.org',
                        'wfh+watch@chromium.org'],
     'base_memory': ['gavinp+memory@chromium.org'],
     'base_task_scheduler': ['fdoray+watch@chromium.org',
                             'gab+watch@chromium.org',
                             'robliao+watch@chromium.org'],
-    'base_win': ['grt+watch@chromium.org', 'wfh+watch@chromium.org'],
+    'base_win': ['grt+watch@chromium.org',
+                 'wfh+watch@chromium.org'],
     'battery_status': ['timvolodine@chromium.org'],
     'blimp' : ['anandc+watch-blimp@chromium.org',
+               'bgoldman+watch-blimp@chromium.org',
                'dtrainor+watch-blimp@chromium.org',
+               'gcasto+watch-blimp@chromium.org',
                'jessicag+watch-blimp@chromium.org',
                'kmarshall+watch-blimp@chromium.org',
                'khushalsagar+watch-blimp@chromium.org',
@@ -1402,23 +1476,220 @@
                'maniscalco+watch-blimp@chromium.org',
                'marcinjb+watch-blimp@chromium.org',
                'nyquist+watch-blimp@chromium.org',
+               'perumaal+watch-blimp@chromium.org',
+               'scf+watch-blimp@chromium.org',
                'shaktisahu+watch-blimp@chromium.org',
-               'sriramsr+watch-blimp@chromium.org'],
+               'sriramsr+watch-blimp@chromium.org',
+               'steimel+watch-blimp@chromium.org'],
+    'blink': ['blink-reviews@chromium.org'],
+    'blink_accessibility': ['aboxhall@chromium.org',
+                            'dmazzoni@chromium.org',
+                            'je_julie.kim@chromium.org',
+                            'nektar@chromium.org'],
+    'blink_animation': ['alexis.menard@intel.com',
+                        'blink-reviews-animation@chromium.org',
+                        'ericwilligers@chromium.org',
+                        'rjwright@chromium.org',
+                        'shans@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',
+                             'timvolodine@chromium.org'],
+    'blink_bidi': ['leviw+bidiwatch@chromium.org'],
+    'blink_bindings': ['blink-reviews-bindings@chromium.org'],
+    'blink_bindings_serialization': ['jbroman+watch@chromium.org'],
+    'blink_bluetooth': ['ortuno+watch@chromium.org',
+                        'scheib+watch@chromium.org'],
+    'blink_canvas2d': ['ajuma+watch-canvas@chromium.org',
+                       'cabanier@adobe.com',
+                       'dongseong.hwang@intel.com',
+                       'junov@chromium.org'],
+    'blink_client_hints': ['yoav@yoav.ws'],
+    'blink_clipboard': ['dcheng@chromium.org'],
+    'blink_css': ['alexis.menard@intel.com',
+                  'apavlov+blink@chromium.org',
+                  'blink-reviews-css@chromium.org',
+                  'dglazkov+blink@chromium.org',
+                  'rob.buis@samsung.com'],
+    'blink_css_flexbox': ['cbiesinger@chromium.org'],
+    'blink_css_fragmentation_tests': ['mstensho@opera.com'],
+    'blink_css_grid_layout': ['jfernandez@igalia.com',
+                              'rego@igalia.com',
+                              'svillar@igalia.com'],
+    'blink_css_regions': ['ChromiumBugTracker@adobe.com'],
+    'blink_custom_elements': ['dglazkov+blink@chromium.org',
+                              'dominicc+watchlist@chromium.org'],
+    'blink_device_light': ['mlamouri+watch-blink@chromium.org',
+                           'timvolodine@chromium.org'],
+    'blink_device_orientation': ['mlamouri+watch-blink@chromium.org',
+                                 'timvolodine@chromium.org'],
+    'blink_devtools': ['apavlov+blink@chromium.org',
+                       'caseq+blink@chromium.org',
+                       'devtools-reviews@chromium.org',
+                       'kozyatinskiy+blink@chromium.org',
+                       'lushnikov+blink@chromium.org',
+                       'pfeldman+blink@chromium.org'],
+    'blink_dom': ['blink-reviews-dom@chromium.org',
+                  'dglazkov+blink@chromium.org',
+                  'eae+blinkwatch@chromium.org',
+                  'rob.buis@samsung.com',
+                  'sigbjornf@opera.com'],
+    'blink_events': ['blink-reviews-events@chromium.org',
+                     'dglazkov+blink@chromium.org',
+                     'dtapuska+blinkwatch@chromium.org',
+                     'eae+blinkwatch@chromium.org'],
+    'blink_fetch': ['gavinp+loader@chromium.org',
+                    'japhet@chromium.org',
+                    'loading-reviews+fetch@chromium.org',
+                    'tyoshino+watch@chromium.org'],
+    'blink_fileapi': ['kinuko+fileapi@chromium.org',
+                      'nhiroki@chromium.org',
+                      'tzik@chromium.org'],
+    'blink_geolocation': ['mlamouri+watch-blink@chromium.org',
+                          'mvanouwerkerk+watch@chromium.org',
+                          'timvolodine@chromium.org'],
+    'blink_heap': ['ager@chromium.org',
+                   'haraken@chromium.org',
+                   'kouhei+heap@chromium.org',
+                   'oilpan-reviews@chromium.org'],
+    'blink_html': ['blink-reviews-html@chromium.org',
+                   'dglazkov+blink@chromium.org'],
+    'blink_htmlparser': ['kinuko+watch@chromium.org',
+                         'loading-reviews+parser@chromium.org'],
+    'blink_indexed_db': ['cmumford@chromium.org',
+                         'jsbell+idb@chromium.org'],
+    'blink_input': ['dtapuska+blinkwatch@chromium.org',
+                    'nzolghadr+blinkwatch@chromium.org'],
+    'blink_layers': ['blink-layers+watch@chromium.org'],
+    'blink_layout': ['blink-reviews-layout@chromium.org',
+                     'eae+blinkwatch@chromium.org',
+                     'jchaffraix+rendering@chromium.org',
+                     'leviw+renderwatch@chromium.org',
+                     'pdr+renderingwatchlist@chromium.org',
+                     'szager+layoutwatch@chromium.org',
+                     'zoltan@webkit.org'],
+    'blink_layout_ng': ['ojan+watch@chromium.org',
+                        'cbiesinger@chromium.org',
+                        'glebl+reviews@chromium.org'],
+    'blink_loader': ['gavinp+loader@chromium.org',
+                     'japhet@chromium.org',
+                     'loading-reviews@chromium.org',
+                     'tyoshino+watch@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',
+                            'yoav@yoav.ws'],
+    'blink_mediacapturefromelement': ['emircan+watch+capturefromdom@chromium.org',
+                                      'mcasas+watch+capturefromdom@chromium.org'],
+    'blink_mediarecorder': ['emircan+watch+mediarecorder@chromium.org',
+                            'mcasas+watch+mediarecorder@chromium.org'],
+    'blink_mediastream': ['mcasas+watch+mediastream@chromium.org',
+                          'tommyw+watchlist@chromium.org'],
+    'blink_modules': ['haraken@chromium.org'],
+    'blink_navigator_content_utils': ['gyuyoung.kim@chromium.org'],
+    'blink_notifications': ['awdf+watch@chromium.org',
+                            'peter@chromium.org'],
+    'blink_out_of_process_frames': ['dcheng@chromium.org',
+                                    'mlamouri+watch-blink@chromium.org'],
+    'blink_owners': ['abarth@chromium.org'],
+    'blink_paint' : ['blink-reviews-paint@chromium.org',
+                     'dongseong.hwang@intel.com'],
+    'blink_permissions': ['mlamouri+watch-blink@chromium.org'],
+    'blink_platform_graphics': ['ajuma+watch@chromium.org',
+                                'blink-reviews-platform-graphics@chromium.org',
+                                'cabanier@adobe.com',
+                                'danakj+watch@chromium.org',
+                                'dongseong.hwang@intel.com',
+                                'drott+blinkwatch@chromium.org',
+                                'dschulze@chromium.org',
+                                'fmalita@chromium.org',
+                                'jbroman@chromium.org',
+                                'junov@chromium.org',
+                                'pdr+graphicswatchlist@chromium.org',
+                                'rob.buis@samsung.com',
+                                'schenney@chromium.org'],
+    'blink_prerender': ['gavinp+prerender@chromium.org',
+                        'yoav@yoav.ws'],
+    'blink_preloadScanner': ['yoav@yoav.ws'],
+    'blink_public_api': ['blink-reviews-api@chromium.org',
+                         'dglazkov+blink@chromium.org'],
+    'blink_push_messaging': ['awdf+watch@chromium.org',
+                             'johnme+watch@chromium.org',
+                             'peter@chromium.org'],
+    'blink_quota': ['kinuko+fileapi@chromium.org',
+                    'nhiroki@chromium.org',
+                    'tzik@chromium.org'],
+    'blink_scheduler': ['scheduler-bugs@chromium.org'],
+    'blink_screen_orientation': ['mlamouri+watch-blink@chromium.org'],
+    'blink_serviceworkers': ['falken@chromium.org',
+                             'horo+watch@chromium.org',
+                             'jsbell+serviceworker@chromium.org',
+                             'kinuko+serviceworker@chromium.org',
+                             'michaeln@chromium.org',
+                             'nhiroki@chromium.org',
+                             'serviceworker-reviews@chromium.org',
+                             'shimazu+serviceworker@chromium.org',
+                             'tzik@chromium.org'],
+    'blink_serviceworkers_tests': ['kenjibaheux+watch@chromium.org'],
+    'blink_spellcheck' : ['groby+blinkspell@chromium.org',
+                          'timvolodine@chromium.org'],
+    'blink_spv2_layout_tests': ['jbroman+watch@chromium.org',
+                                'pdr+virtualspv2watchlist@chromium.org'],
+    'blink_style': ['blink-reviews-style@chromium.org'],
+    'blink_svg': ['dschulze@chromium.org',
+                  'fmalita@chromium.org',
+                  'fs@opera.com',
+                  'gyuyoung.kim@chromium.org',
+                  'kouhei+svg@chromium.org',
+                  'pdr+svgwatchlist@chromium.org',
+                  'rob.buis@samsung.com',
+                  'schenney@chromium.org'],
     'blink_tools': ['dpranke@chromium.org'],
-    'bookmarks': ['noyau+watch@chromium.org', 'tfarina@chromium.org'],
+    'blink_track': ['eric.carlson@apple.com',
+                    'fs@opera.com',
+                    'glenn@chromium.org',
+                    'silviapf@chromium.org',
+                    'vcarbune@chromium.org'],
+    'blink_vibration': ['mlamouri+watch-blink@chromium.org',
+                        'mvanouwerkerk+watch@chromium.org'],
+    'blink_viewport_interaction': ['kenneth.christiansen@gmail.com'],
+    'blink_w3ctests': ['blink-reviews-w3ctests@chromium.org'],
+    'blink_web': ['kinuko+watch@chromium.org'],
+    'blink_webcomponents': ['dglazkov+blink@chromium.org',
+                            'webcomponents-bugzilla@chromium.org'],
+    'blink_webp': ['jzern@chromium.org',
+                   'skal@google.com',
+                   'urvang@chromium.org'],
+    'blink_websockets': ['tyoshino+watch@chromium.org',
+                         'yhirano+watch@chromium.org'],
+    'blink_workers': ['blink-worker-reviews@chromium.org',
+                      'falken@chromium.org',
+                      'horo+watch@chromium.org',
+                      'kinuko+worker@chromium.org',
+                      'shimazu+worker@chromium.org'],
+    'blink_wtf': ['blink-reviews-wtf@chromium.org',
+                  'mikhail.pozdnyakov@intel.com'],
+    'blink_xmlhttprequest': ['tyoshino+watch@chromium.org'],
+    'bookmarks': ['tfarina@chromium.org'],
+    'bottombar': ['donnd+watch@chromium.org',
+                  'mdjones+watch@chromium.org'],
     'browser_chromeos': ['davemoore+watch@chromium.org'],
     'browser_components': ['browser-components-watch@chromium.org'],
-    'browser_compositor': ['vollick@chromium.org',
-                           'piman+watch@chromium.org'],
+    'browser_compositor': ['piman+watch@chromium.org',
+                           'vollick@chromium.org'],
     'browser_resources': ['arv+watch@chromium.org'],
     'browser_resources_md': ['michaelpg+watch-md-ui@chromium.org'],
     'browsing_data': ['markusheintz@chromium.org',
                       'msramek+watch@chromium.org'],
-    'bubble': ['msw+watch@chromium.org',
-               'rouslan+bubble@chromium.org',
-               'hcarmona+bubble@chromium.org',
-               'groby+bubble@chromium.org'],
-    'cache_storage': ['jkarlin+watch@chromium.org', 'nhiroki@chromium.org'],
+    'bubble': ['hcarmona+bubble@chromium.org',
+               'groby+bubble@chromium.org',
+               'msw+watch@chromium.org',
+               'rouslan+bubble@chromium.org'],
+    'cache_storage': ['jkarlin+watch@chromium.org',
+                      'nhiroki@chromium.org'],
     'cast': ['avayvod+watch@chromium.org',
              'imcheng+watch@chromium.org',
              'isheriff+watch@chromium.org',
@@ -1430,31 +1701,37 @@
                          'sheretov+watch@chromium.org',
                          'vadimgo+watch@chromium.org'],
     'cc': ['cc-bugs@chromium.org'],
-    'certificate_transparency': ['eranm@chromium.org', 'certificate-transparency-chrome@googlegroups.com'],
-    'chrome_elf': ['caitkp+watch@chromium.org',],
+    'certificate_transparency': ['certificate-transparency-chrome@googlegroups.com',
+                                 'eranm@chromium.org',
+                                 'rsleevi+watch@chromium.org'],
+    'chrome_elf': ['caitkp+watch@chromium.org',
+                   'pennymac+watch@chromium.org'],
     'chrome_views': ['tfarina@chromium.org'],
     'chromecast': ['alokp+watch@chromium.org',
                    'halliwell+watch@chromium.org',
                    'lcwu+watch@chromium.org'],
     'chromecast_public': ['gfhuang+watch@chromium.org'],
     'chromedriver': ['samuong+watch@chromium.org'],
-    'chromeos' : ['oshima+watch@chromium.org'],
-    'chromeos_attestation' : ['dkrahn+watch@chromium.org'],
-    'chromeos_calculator' : ['dharcourt@chromium.org'],
+    'chromeos': ['oshima+watch@chromium.org'],
+    'chromeos_attestation': ['dkrahn+watch@chromium.org'],
+    'chromeos_calculator': ['dharcourt@chromium.org'],
     'chromeos_dbus': ['hashimoto+watch@chromium.org'],
-    'chromeos_net' : ['stevenjb+watch@chromium.org'],
-    'chromeos_power' : ['derat+watch@chromium.org'],
-    'chromeos_login' : ['achuith+watch@chromium.org',
-                        'dzhioev+watch@chromium.org'],
-    'clang_update': ['ukai+watch@chromium.org',
-                     'dmikurube+clang@chromium.org',
+    'chromeos_geolocation': ['alemate+watch@chromium.org'],
+    'chromeos_login': ['achuith+watch@chromium.org',
+                       'alemate+watch@chromium.org'],
+    'chromeos_net': ['stevenjb+watch@chromium.org'],
+    'chromeos_power': ['derat+watch@chromium.org'],
+    'chromeos_timezone': ['alemate+watch@chromium.org'],
+    'chromeos_webui': ['alemate+watch@chromium.org'],
+    'clang_update': ['dmikurube+clang@chromium.org',
                      'eugenis+clang@chromium.org',
-                     'yunlian@chromium.org',
-                     'thakis@chromium.org',
+                     'glider+clang@chromium.org',
                      'hans@chromium.org',
                      'rnk@chromium.org',
-                     'glider+clang@chromium.org',
-                     'vmpstr+watch@chromium.org'],
+                     'thakis@chromium.org',
+                     'ukai+watch@chromium.org',
+                     'vmpstr+watch@chromium.org',
+                     'yunlian@chromium.org'],
     'clipboard': ['dcheng@chromium.org'],
     'closure': ['dbeam+watch-closure@chromium.org',
                 'jlklein+watch-closure@chromium.org',
@@ -1462,33 +1739,39 @@
     'components_deps': ['blundell+watchlist@chromium.org',
                         'droger+watchlist@chromium.org',
                         'sdefresne+watchlist@chromium.org'],
-    'content': ['jam@chromium.org',
-                'darin-cc@chromium.org' ],
-    'content_bluetooth': ['scheib+watch@chromium.org',
-                          'ortuno+watch@chromium.org'],
-    'content_loader': ['loading-reviews@chromium.org', 'rdsmith@chromium.org',
-                       'mmenke@chromium.org'],
-    'content_renderer': [ 'mlamouri+watch-content@chromium.org'],
+    'content': ['darin-cc@chromium.org',
+                'jam@chromium.org'],
+    'content_bluetooth': ['ortuno+watch@chromium.org',
+                          'scheib+watch@chromium.org'],
+    'content_loader': ['loading-reviews@chromium.org',
+                       'mmenke@chromium.org',
+                       'rdsmith@chromium.org'],
+    'content_renderer': ['mlamouri+watch-content@chromium.org'],
     'content_shell': ['jochen+watch@chromium.org',
                       'mlamouri+watch-content@chromium.org',
                       'peter@chromium.org'],
     'content_worker': ['blink-worker-reviews@chromium.org',
                        'kinuko+watch@chromium.org'],
-    'courgette': ['wfh+watch@chromium.org',
-                  'huangs+watch@chromium.org'],
+    'contextual_search': ['donnd+watch@chromium.org',
+                          'twellington+watch@chromium.org'],
+    'courgette': ['huangs+watch@chromium.org',
+                  'wfh+watch@chromium.org'],
     'cr_elements': ['dbeam+watch-elements@chromium.org',
                     'michaelpg+watch-elements@chromium.org',
                     'stevenjb+watch-md-settings@chromium.org'],
     'custom_tabs': ['lizeb+watch-custom-tabs@chromium.org'],
+    'data_reduction_proxy': ['tbansal+watch-data-reduction-proxy@chromium.org'],
     'deep_memory_profiler': ['dmikurube@chromium.org'],
-    'device_bluetooth': ['scheib+watch@chromium.org',
-                         'ortuno+watch@chromium.org'],
-    'device_sensors': ['timvolodine@chromium.org',
+    'device_bluetooth': ['ortuno+watch@chromium.org',
+                         'scheib+watch@chromium.org'],
+    'device_sensors': ['mlamouri+watch-sensors@chromium.org',
                        'rijubrata.bhaumik@intel.com',
-                       'mlamouri+watch-sensors@chromium.org'],
+                       'timvolodine@chromium.org'],
     'developer_recommended_flags': ['scheib+watch@chromium.org'],
-    'devtools': ['pfeldman@chromium.org', 'devtools-reviews@chromium.org'],
-    'disk_cache': ['gavinp+disk@chromium.org', 'kinuko+cache@chromium.org' ],
+    'devtools': ['devtools-reviews@chromium.org',
+                 'pfeldman@chromium.org'],
+    'disk_cache': ['kinuko+cache@chromium.org',
+                   'gavinp+disk@chromium.org'],
     'download': ['asanka@chromium.org'],
     'downloads_ui': ['asanka@chromium.org',
                      'dbeam+watch-downloads@chromium.org'],
@@ -1503,15 +1786,22 @@
                 'nhiroki@chromium.org',
                 'tzik@chromium.org'],
     'filebrowse': ['rginda+watch@chromium.org'],
-    'filesapp': ['mtomasz+watch@chromium.org'],
+    'filesapp': ['fukino+watch@chromium.org',
+                 'oka+watch@chromium.org',
+                 'yamaguchi+watch@chromium.org'],
+    'filesapp_ui': ['mtomasz+watch@chromium.org'],
     'ftp': ['phajdan.jr@chromium.org'],
-    'gcm': ['zea+watch@chromium.org', 'peter@chromium.org',
-            'johnme+watch@chromium.org'],
-    'geolocation': ['mvanouwerkerk@chromium.org',
-                    'mlamouri+watch-geolocation@chromium.org'],
+    'fuzzing': ['fuzzing@chromium.org'],
+    'gcm': ['johnme+watch@chromium.org',
+            'peter@chromium.org',
+            'zea+watch@chromium.org'],
+    'geolocation': ['mlamouri+watch-geolocation@chromium.org',
+                    'mvanouwerkerk@chromium.org'],
     'gfx_geometry': ['cc-bugs@chromium.org'],
     'gfx_image': ['rsesek+watch@chromium.org'],
-    'gn': ['dpranke@chromium.org', 'tfarina@chromium.org'],
+    'gn': ['agrieve+watch@chromium.org',
+           'dpranke@chromium.org',
+           'tfarina@chromium.org'],
     'gpu': ['piman+watch@chromium.org'],
     'history_ui': ['dbeam+watch-history@chromium.org',
                    'dubroy@chromium.org',
@@ -1523,29 +1813,41 @@
                    'jsbell+idb@chromium.org'],
     'ink_drop': ['bruthig+ink_drop@chromium.org'],
     'input': ['dtapuska+chromiumwatch@chromium.org'],
-    'installer': ['grt+watch@chromium.org', 'wfh+watch@chromium.org'],
+    'installer': ['grt+watch@chromium.org',
+                  'pennymac+watch@chromium.org',
+                  'wfh+watch@chromium.org'],
     'installer_linux': [ 'mmoss@chromium.org'],
-    'instant': ['dcblack@chromium.org', 'jered@chromium.org',
-                'samarth+watch@chromium.org', 'donnd+watch@chromium.org',
-                'melevin+watch@chromium.org', 'dougw+watch@chromium.org',
-                'kmadhusu+watch@chromium.org', 'dhollowa+watch@chromium.org',
-                'jfweitz+watch@chromium.org', 'skanuj+watch@chromium.org'],
+    'instant': ['dcblack@chromium.org',
+                'dhollowa+watch@chromium.org',
+                'donnd+watch@chromium.org',
+                'dougw+watch@chromium.org',
+                'jered@chromium.org',
+                'jfweitz+watch@chromium.org',
+                'kmadhusu+watch@chromium.org',
+                'melevin+watch@chromium.org',
+                'samarth+watch@chromium.org',
+                'skanuj+watch@chromium.org'],
     'ios_chrome': ['sdefresne+watch@chromium.org'],
-    'ipc': ['jam@chromium.org', 'darin-cc@chromium.org'],
-    'login': ['vabr+watchlistlogin@chromium.org'],
-    'libwebp': ['urvang@chromium.org', 'jzern@chromium.org', 'skal@google.com'],
-    'libvpx': ['tomfinegan@chromium.org', 'jzern@chromium.org',
-               'fgalligan@chromium.org', 'johannkoenig@chromium.org'],
+    'ipc': ['darin-cc@chromium.org',
+            'jam@chromium.org'],
+    'libwebp': ['jzern@chromium.org',
+                'skal@google.com',
+                'urvang@chromium.org'],
+    'libvpx': ['fgalligan@chromium.org',
+               'johannkoenig@chromium.org',
+               'jzern@chromium.org',
+               'tomfinegan@chromium.org'],
     'linux_fonts': ['derat+watch@chromium.org'],
     'linux_sandboxing': ['jln+watch@chromium.org'],
     'linux_seccomp_bpf': ['jln+watch@chromium.org'],
-    'supervised_users': ['pam+watch@chromium.org'],
+    'login': ['vabr+watchlistlogin@chromium.org'],
     'manifest': ['mlamouri+watch-manifest@chromium.org'],
     'md_settings': ['dbeam+watch-settings@chromium.org',
                     'michaelpg+watch-md-settings@chromium.org',
                     'stevenjb+watch-md-settings@chromium.org'],
     'media': ['feature-media-reviews@chromium.org'],
-    'media_galleries': ['thestig@chromium.org', 'tommycli@chromium.org'],
+    'media_galleries': ['thestig@chromium.org',
+                        'tommycli@chromium.org'],
     'media_mojo': ['alokp+watch@chromium.org'],
     'media_router': ['media-router+watch@chromium.org'],
     'message_loop': ['sadrul@chromium.org'],
@@ -1554,7 +1856,6 @@
     'midi': ['toyoshim+midi@chromium.org'],
     'mojo': ['aa@chromium.org',
              'abarth@chromium.org',
-             'ben+mojo@chromium.org',
              'darin@chromium.org',
              'qsr+mojo@chromium.org',
              'viettrungluu+watch@chromium.org',
@@ -1562,38 +1863,51 @@
     'mouse_lock': ['scheib+watch@chromium.org'],
     'mus': ['rjkroege@chromium.org'],
     'nacl': ['native-client-reviews@googlegroups.com'],
-    'native_client_sdk': ['sbc@chromium.org', 'binji+watch@chromium.org'],
-    'navigation': ['creis+watch@chromium.org', 'nasko+codewatch@chromium.org'],
+    'native_client_sdk': ['binji+watch@chromium.org',
+                          'sbc@chromium.org'],
+    'navigation': ['creis+watch@chromium.org',
+                   'nasko+codewatch@chromium.org'],
     'net': ['cbentzel+watch@chromium.org'],
     'net_error_list': ['mmenke@chromium.org'],
+    'net_log': ['eroman@chromium.org',
+                'mmenke@chromium.org'],
     'netinfo': ['jkarlin+watch@chromium.org'],
-    'net_log': ['mmenke@chromium.org', 'eroman@chromium.org'],
-    'notifications': ['peter@chromium.org',
-                      'mlamouri+watch-notifications@chromium.org'],
+    'notifications': ['awdf+watch@chromium.org',
+                      'mlamouri+watch-notifications@chromium.org',
+                      'peter@chromium.org'],
+    'nqe': ['tbansal+watch-nqe@chromium.org'],
     'ntp': ['dbeam+watch-ntp@chromium.org',
             'pedrosimonetti+watch@chromium.org'],
     'ntp_snippets': ['ntp-dev+reviews@chromium.org'],
-    'offline_pages': ['dimich+watch@chromium.org',
+    'ntp_tiles': ['ntp-dev+reviews@chromium.org'],
+    'offline_pages': ['chili+watch@chromium.org',
+                      'dewittj+watch@chromium.org',
+                      'dimich+watch@chromium.org',
                       'fgorski+watch@chromium.org',
                       'petewil+watch@chromium.org',
-                      'romax+watch@chromium.org',
-                      'chili+watch@chromium.org',
-                      'dewittj+watch@chromium.org'],
+                      'romax+watch@chromium.org'],
     'omnibox': ['suzhe@chromium.org'],
     'options': ['dbeam+watch-options@chromium.org',
                 'michaelpg+watch-options@chromium.org'],
-    'origin_trials': ['chasej+watch@chromium.org'],
-    'ozone': ['kalyan.kondapally@intel.com', 'ozone-reviews@chromium.org'],
+    'origin_trials': ['chasej+watch@chromium.org',
+                      'iclelland+watch@chromuim.org'],
+    'ozone': ['kalyan.kondapally@intel.com',
+              'ozone-reviews@chromium.org'],
     'page_load_metrics' : ['csharrison+watch@chromium.org',
                            'loading-reviews+metrics@chromium.org'],
-    'panels': ['dimich@chromium.org', 'jennb@chromium.org',
-               'dcheng@chromium.org', 'jianli@chromium.org'],
+    'panels': ['dcheng@chromium.org',
+               'dimich@chromium.org',
+               'jennb@chromium.org',
+               'jianli@chromium.org'],
     'password_manager': ['gcasto+watchlist@chromium.org',
                          'vabr+watchlistpasswordmanager@chromium.org'],
-    'pepper_api': ['bradnelson+warch@chromium.org',
-                   'piman+watch@chromium.org', 'ihf+watch@chromium.org',
-                   'yusukes+watch@chromium.org', 'binji+watch@chromium.org',
-                   'teravest+watch@chromium.org', 'tzik@chromium.org'],
+    'pepper_api': ['binji+watch@chromium.org',
+                   'bradnelson+warch@chromium.org',
+                   'ihf+watch@chromium.org',
+                   'piman+watch@chromium.org',
+                   'teravest+watch@chromium.org',
+                   'tzik@chromium.org',
+                   'yusukes+watch@chromium.org'],
     'permissions': ['mlamouri+watch-permissions@chromium.org'],
     'plugin': ['jam@chromium.org'],
     'policy_definitions': ['tnagel+watch@chromium.org'],
@@ -1602,59 +1916,71 @@
     'precache': ['wifiprefetch-reviews@google.com'],
     'predictors': ['shishir+watch@chromium.org'],
     'prepopulated_engines': ['vasilii+watch@chromium.org'],
-    'prerender': ['cbentzel+watch@chromium.org', 'tburkard+watch@chromium.org',
-                  'gavinp+prer@chromium.org'],
-    'push_messaging': ['peter@chromium.org', 'johnme+watch@chromium.org',
-                       'harkness+watch@chromium.org'],
+    'prerender': ['cbentzel+watch@chromium.org',
+                  'gavinp+prer@chromium.org',
+                  'tburkard+watch@chromium.org'],
+    'push_messaging': ['harkness+watch@chromium.org',
+                       'johnme+watch@chromium.org',
+                       'peter@chromium.org'],
     'pyauto': ['anantha@chromium.org',
-               'dyu@chromium.org',
-               'dennisjeffrey@chromium.org'],
+               'dennisjeffrey@chromium.org',
+               'dyu@chromium.org'],
     'remoting': ['chromoting-reviews@chromium.org'],
-    'rlz_id': ['gab+watch@chromium.org',
-               'robertshield+watch@chromium.org',
-               'alito+watch@chromium.org'],
+    'rlz_id': ['alito+watch@chromium.org',
+               'gab+watch@chromium.org',
+               'robertshield+watch@chromium.org'],
     'safe_browsing': ['grt+watch@chromium.org'],
     'sandbox': ['rickyz+watch@chromium.org'],
     'scheduler': ['scheduler-bugs@chromium.org'],
     'screen_orientation': ['mlamouri+watch-screen-orientation@chromium.org'],
-    'service_worker': ['tzik@chromium.org',
-                       'kinuko+serviceworker@chromium.org',
-                       'nhiroki@chromium.org',
-                       'horo+watch@chromium.org',
+    'service_worker': ['horo+watch@chromium.org',
                        'jsbell+serviceworker@chromium.org',
+                       'kinuko+serviceworker@chromium.org',
                        'michaeln@chromium.org',
-                       'serviceworker-reviews@chromium.org'],
+                       'nhiroki@chromium.org',
+                       'serviceworker-reviews@chromium.org',
+                       'shimazu+serviceworker@chromium.org',
+                       'tzik@chromium.org'],
     'site_engagement': ['dominickn+watch@chromium.org'],
-    'site_instance': ['creis+watch@chromium.org', 'ajwong+watch@chromium.org',
+    'site_instance': ['ajwong+watch@chromium.org',
+                      'creis+watch@chromium.org',
                       'nasko+codewatch@chromium.org'],
     'spellcheck': ['groby+spellwatch@chromium.org',
                    'rlp+watch@chromium.org',
-                   'rouslan+spell@chromium.org'],
+                   'rouslan+spell@chromium.org',
+                   'timvolodine@chromium.org'],
     'streams': ['zork+watch@chromium.org'],
-    'styleguide': ['danakj+watch@chromium.org', 'jbroman+cpp@chromium.org'],
+    'styleguide': ['danakj+watch@chromium.org',
+                   'jbroman+cpp@chromium.org'],
+    'supervised_users': ['pam+watch@chromium.org'],
     'sync': ['sync-reviews@chromium.org'],
     'syncfs': ['kinuko+fileapi@chromium.org',
                'nhiroki@chromium.org',
                'tzik@chromium.org'],
-    'sync_proto': ['albertb+watch@chromium.org'],
     'tab_capture': ['miu+watch@chromium.org'],
-    'tab_contents': ['avi@chromium.org',
-                     'creis+watch@chromium.org', 'ajwong+watch@chromium.org'],
+    'tab_contents': ['ajwong+watch@chromium.org',
+                     'avi@chromium.org',
+                     'creis+watch@chromium.org'],
     'tab_media_indicators': ['miu+watch@chromium.org'],
     'tcmalloc': ['dmikurube@chromium.org'],
     'telemetry': ['telemetry-reviews@chromium.org'],
+    'test_runner': ['jochen+watch@chromium.org',
+                    'mlamouri+watch-test-runner@chromium.org',
+                    'einbinder+watch-test-runner@chromium.org'],
     'tests': [],
-    'textinput': ['suzhe@chromium.org',
-                  'yusukes+watch@chromium.org',
-                  'nona+watch@chromium.org',
-                  'shuchen+watch@chromium.org'],
-    'textinput_chromeos': ['yusukes+watch@chromium.org',
-                           'nona+watch@chromium.org',
-                           'shuchen+watch@chromium.org'],
+    'textinput': ['nona+watch@chromium.org',
+                  'shuchen+watch@chromium.org',
+                  'suzhe@chromium.org',
+                  'yusukes+watch@chromium.org'],
+    'textinput_chromeos': ['nona+watch@chromium.org',
+                           'shuchen+watch@chromium.org',
+                           'yusukes+watch@chromium.org'],
     'timers': ['chirantan+watch@chromium.org'],
     'tools_emacs': ['dhollowa+watch@chromium.org'],
-    'tracing': ['tracing+reviews@chromium.org', 'wfh+watch@chromium.org'],
+    'tracing': ['tracing+reviews@chromium.org',
+                'wfh+watch@chromium.org'],
     'ui_compositor': ['cc-bugs@chromium.org'],
+    'ui_display_win': ['robliao+watch@chromium.org'],
     'ui_resources': ['oshima+watch@chromium.org'],
     'valgrind': ['bruening+watch@chromium.org',
                  'glider+watch@chromium.org'],
@@ -1666,210 +1992,16 @@
     'views': ['tfarina@chromium.org'],
     'virtual_keyboard': ['dfaden+virtualkb@google.com',
                          'groby+virtualkb@chromium.org'],
-    'webrtc_browser_tests': ['phoglund+watch@chromium.org',
-                             'tnakamura+watch@chromium.org'],
+    'webrtc_browser_tests': ['phoglund+watch@chromium.org'],
     'website_settings': ['markusheintz@chromium.org',
-                         'raymes+watch@chromium.org',
-                         'msramek+watch@chromium.org'],
-    'windows_sandboxing': ['wfh+watch@chromium.org'],
+                         'msramek+watch@chromium.org',
+                         'raymes+watch@chromium.org'],
+    'windows_sandboxing': ['pennymac+watch@chromium.org',
+                           'wfh+watch@chromium.org'],
     'x11': ['derat+watch@chromium.org',
             'sadrul@chromium.org',
             'yusukes+watch@chromium.org'],
+    'xml': ['dominicc+watchlist@chromium.org'],
     'zoom': ['wjmaclean@chromium.org'],
-
-    'blink': ['blink-reviews@chromium.org'],
-    'blink_accessibility': ['dmazzoni@chromium.org',
-                           'aboxhall@chromium.org',
-                           'nektar@chromium.org',
-                           'je_julie.kim@chromium.org'],
-    'blink_animation': ['alexis.menard@intel.com',
-                         'ericwilligers@chromium.org',
-                         'rjwright@chromium.org',
-                         'shans@chromium.org',
-                         'blink-reviews-animation@chromium.org'],
-    'blink_app_banner': [ 'mlamouri+watch-blink@chromium.org' ],
-    'blink_audio': ['rtoy@chromium.org',
-                    'hongchan@chromium.org'],
-    'blink_battery_status': [ 'timvolodine@chromium.org',
-                              'mlamouri+watch-blink@chromium.org' ],
-    'blink_bidi': [ 'leviw+bidiwatch@chromium.org' ],
-    'blink_bindings': [ 'blink-reviews-bindings@chromium.org' ],
-    'blink_bluetooth': [ 'scheib+watch@chromium.org',
-                         'ortuno+watch@chromium.org'],
-    'blink_canvas2d': [ 'cabanier@adobe.com',
-                        'dongseong.hwang@intel.com',
-                        'junov@chromium.org',
-                        'ajuma+watch-canvas@chromium.org' ],
-    'blink_clipboard': [ 'dcheng@chromium.org', ],
-    'blink_css': [ 'alexis.menard@intel.com',
-                   'apavlov+blink@chromium.org',
-                   'dglazkov+blink@chromium.org',
-                   'rob.buis@samsung.com',
-                   'blink-reviews-css@chromium.org' ],
-    'blink_css_grid_layout': [ 'svillar@igalia.com',
-                               'jfernandez@igalia.com',
-                               'rego@igalia.com' ],
-    'blink_css_flexbox': [ 'cbiesinger@chromium.org' ],
-    'blink_css_fragmentation_tests': [ 'mstensho@opera.com' ],
-    'blink_css_regions': [ 'ChromiumBugTracker@adobe.com' ],
-    'blink_custom_elements': [ 'dominicc+watchlist@chromium.org',
-                               'dglazkov+blink@chromium.org' ],
-    'blink_dom': [ 'eae+blinkwatch@chromium.org',
-                   'dglazkov+blink@chromium.org',
-                   'sigbjornf@opera.com',
-                   'rob.buis@samsung.com',
-                   'blink-reviews-dom@chromium.org' ],
-    'blink_device_light': [ 'timvolodine@chromium.org',
-                            'mlamouri+watch-blink@chromium.org' ],
-    'blink_device_orientation': [ 'timvolodine@chromium.org',
-                                  'mlamouri+watch-blink@chromium.org' ],
-    'blink_devtools': [ 'pfeldman+blink@chromium.org',
-                        'apavlov+blink@chromium.org',
-                        'lushnikov+blink@chromium.org',
-                        'caseq+blink@chromium.org',
-                        'sergeyv+blink@chromium.org',
-                        'kozyatinskiy+blink@chromium.org',
-                        'devtools-reviews@chromium.org' ],
-    'blink_events': [ 'eae+blinkwatch@chromium.org',
-                      'dglazkov+blink@chromium.org',
-                      'dtapuska+blinkwatch@chromium.org',
-                      'blink-reviews-events@chromium.org' ],
-    'blink_fetch': [ 'japhet@chromium.org',
-                     'gavinp+loader@chromium.org',
-                     'tyoshino+watch@chromium.org',
-                     'loading-reviews+fetch@chromium.org' ],
-    'blink_input': [ 'dtapuska+blinkwatch@chromium.org',
-                     'nzolghadr+blinkwatch@chromium.org' ],
-    'blink_layers': [ 'blink-layers+watch@chromium.org' ],
-    'blink_loader': [ 'japhet@chromium.org',
-                      'gavinp+loader@chromium.org',
-                      'tyoshino+watch@chromium.org',
-                      'loading-reviews@chromium.org' ],
-    'blink_owners': [ 'abarth@chromium.org'],
-    'blink_platform_graphics': [ 'schenney@chromium.org',
-                                 'danakj+watch@chromium.org',
-                                 'pdr+graphicswatchlist@chromium.org',
-                                 'cabanier@adobe.com',
-                                 'dschulze@chromium.org',
-                                 'rob.buis@samsung.com',
-                                 'fmalita@chromium.org',
-                                 'jbroman@chromium.org',
-                                 'dongseong.hwang@intel.com',
-                                 'drott+blinkwatch@chromium.org',
-                                 'junov@chromium.org',
-                                 'ajuma+watch@chromium.org',
-                                 'blink-reviews-platform-graphics@chromium.org' ],
-    'blink_modules': [ 'haraken@chromium.org' ],
-    'blink_heap': [ 'ager@chromium.org',
-                    'haraken@chromium.org',
-                    'kouhei+heap@chromium.org',
-                    'oilpan-reviews@chromium.org' ],
-    'blink_html': [ 'dglazkov+blink@chromium.org',
-                    'blink-reviews-html@chromium.org' ],
-    'blink_public_api': [ 'dglazkov+blink@chromium.org',
-                          'blink-reviews-api@chromium.org' ],
-    'blink_indexed_db': ['jsbell+idb@chromium.org',
-                         'cmumford@chromium.org'],
-    'blink_layout': [ 'pdr+renderingwatchlist@chromium.org',
-                      'eae+blinkwatch@chromium.org',
-                      'jchaffraix+rendering@chromium.org',
-                      'leviw+renderwatch@chromium.org',
-                      'zoltan@webkit.org',
-                      'szager+layoutwatch@chromium.org',
-                      'blink-reviews-layout@chromium.org' ],
-    'blink_paint' : [ 'blink-reviews-paint@chromium.org',
-                      'slimming-paint-reviews@chromium.org',
-                      'dongseong.hwang@intel.com' ],
-    'blink_permissions': [ 'mlamouri+watch-blink@chromium.org' ],
-    'blink_prerender': [ 'gavinp+prerender@chromium.org',
-                         'yoav@yoav.ws' ],
-    'blink_preloadScanner': [ 'yoav@yoav.ws' ],
-    'blink_push_messaging': [ 'johnme+watch@chromium.org',
-                              'peter@chromium.org' ],
-    'blink_client_hints': [ 'yoav@yoav.ws' ],
-    'blink_scheduler': [ 'scheduler-bugs@chromium.org' ],
-    'blink_track': [ 'vcarbune@chromium.org',
-                     'silviapf@chromium.org',
-                     'glenn@chromium.org',
-                     'fs@opera.com',
-                     'eric.carlson@apple.com' ],
-    'blink_media': [ 'feature-media-reviews@chromium.org',
-                     'eric.carlson@apple.com',
-                     'mlamouri+watch-blink@chromium.org' ],
-    'blink_media_queries': [ 'kenneth.christiansen@gmail.com',
-                             'yoav@yoav.ws' ],
-    'blink_fileapi': [ 'kinuko+fileapi@chromium.org',
-                       'tzik@chromium.org',
-                       'nhiroki@chromium.org' ],
-    'blink_quota': [ 'kinuko+fileapi@chromium.org',
-                     'tzik@chromium.org',
-                     'nhiroki@chromium.org' ],
-    'blink_viewport_interaction': [ 'kenneth.christiansen@gmail.com' ],
-    'blink_webcomponents': [ 'webcomponents-bugzilla@chromium.org',
-                             'dglazkov+blink@chromium.org' ],
-    'blink_mediacapturefromelement': [ 'emircan+watch+capturefromdom@chromium.org',
-                                       'mcasas+watch+capturefromdom@chromium.org' ],
-    'blink_mediarecorder': [ 'emircan+watch+mediarecorder@chromium.org',
-                             'mcasas+watch+mediarecorder@chromium.org' ],
-    'blink_mediastream': [ 'tommyw+watchlist@chromium.org',
-                           'mcasas+watch+mediastream@chromium.org' ],
-    'blink_navigator_content_utils': [ 'gyuyoung.kim@chromium.org' ],
-    'blink_notifications': [ 'peter@chromium.org' ],
-    'blink_geolocation': [ 'mvanouwerkerk+watch@chromium.org',
-                           'timvolodine@chromium.org',
-                           'mlamouri+watch-blink@chromium.org' ],
-    'blink_htmlparser': [ 'kinuko+watch@chromium.org' ],
-    'blink_vibration': [ 'mvanouwerkerk+watch@chromium.org',
-                         'mlamouri+watch-blink@chromium.org' ],
-    'blink_serviceworkers': [ 'jsbell+serviceworker@chromium.org',
-                              'kinuko+serviceworker@chromium.org',
-                              'tzik@chromium.org',
-                              'nhiroki@chromium.org',
-                              'horo+watch@chromium.org',
-                              'falken@chromium.org',
-                              'michaeln@chromium.org',
-                              'serviceworker-reviews@chromium.org' ],
-    'blink_serviceworkers_tests': [ 'kenjibaheux+watch@chromium.org' ],
-    'blink_sheriff_o_matic': [ 'jochen@chromium.org',
-                               'szager@chromium.org',
-                               'dsinclair@chromium.org',
-                               'ojan@chromium.org',
-                               'leviw@chromium.org',
-                               'michaelpg@chromium.org',
-                               'cbiesinger@chromium.org',
-                               'teravest@chromium.org' ],
-    'blink_spellcheck' : [ 'groby+blinkspell@chromium.org' ],
-    'blink_spv2_layout_tests': [ 'jbroman+watch@chromium.org',
-                                 'pdr+virtualspv2watchlist@chromium.org' ],
-    'blink_style': [ 'blink-reviews-style@chromium.org' ],
-    'blink_svg': [ 'schenney@chromium.org',
-                   'pdr+svgwatchlist@chromium.org',
-                   'fmalita@chromium.org',
-                   'dschulze@chromium.org',
-                   'rob.buis@samsung.com',
-                   'fs@opera.com',
-                   'gyuyoung.kim@chromium.org',
-                   'kouhei+svg@chromium.org' ],
-    'blink_w3ctests' : [ 'blink-reviews-w3ctests@chromium.org' ],
-    'blink_webp': [ 'urvang@chromium.org',
-                    'jzern@chromium.org',
-                    'skal@google.com' ],
-    'blink_out_of_process_frames': [ 'dcheng@chromium.org',
-                                     'mlamouri+watch-blink@chromium.org' ],
-    'blink_screen_orientation': [ 'mlamouri+watch-blink@chromium.org' ],
-    'blink_web': [ 'kinuko+watch@chromium.org' ],
-    'blink_websockets': [ 'tyoshino+watch@chromium.org',
-                          'yhirano+watch@chromium.org' ],
-    'blink_workers': [ 'blink-worker-reviews@chromium.org',
-                       'kinuko+worker@chromium.org',
-                       'horo+watch@chromium.org',
-                       'falken@chromium.org' ],
-    'blink_wtf': [ 'mikhail.pozdnyakov@intel.com',
-                   'blink-reviews-wtf@chromium.org' ],
-    'blink_xmlhttprequest': [ 'tyoshino+watch@chromium.org' ],
-    'test_runner': [ 'jochen+watch@chromium.org',
-                     'mlamouri+watch-test-runner@chromium.org' ],
-    'clank_uma_settings': ['gayane+watch@chromium.org'],
-    'xml': [ 'dominicc+watchlist@chromium.org' ],
   },
 }