BASELINE: Update Chromium to 62.0.3202.101

Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 532 insertions, 562 deletions

diff --git a/chromium/WATCHLISTS b/chromium/WATCHLISTS
index fec6a1a48ab..0e677dbcaef 100644
--- a/chromium/WATCHLISTS
+++ b/chromium/WATCHLISTS
@@ -25,10 +25,6 @@
                   '|isimpledom' \
                   '|liblouis'
     },
-    'activity_log': {
-      'filepath': 'chrome/browser/extensions/activity_log/' \
-                  '|chrome/browser/extensions/api/activity_log_private/'
-    },
     'add_to_homescreen': {
       'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/webapps/|'\
                   'chrome/android/javatests/src/org/chromium/chrome/browser/webapps/|'\
@@ -37,10 +33,6 @@
                   'chrome/browser/android/shortcut_.*|'\
                   'chrome/browser/android/webapps/',
     },
-    'android_item_chooser_dialogs': {
-      'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/.*ChooserDialog.java|'\
-                  'chrome/android/javatests/src/org/chromium/chrome/browser/.*ChooserDialogTest.java'
-    },
     'android_crash_reporting': {
       'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/crash/'
     },
@@ -51,12 +43,14 @@
       'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/infobar/'
     },
     'android_infra': {
-      'filepath': 'build/android/' \
+      'filepath': 'build/config/android/' \
+                  'build/android/' \
                   '|testing/android/' \
                   '|tools/android/'
     },
-    'android_java': {
-      'filepath': '/java/'
+    'android_item_chooser_dialogs': {
+      'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/.*ChooserDialog.java|'\
+                  'chrome/android/javatests/src/org/chromium/chrome/browser/.*ChooserDialogTest.java'
     },
     'android_loading': {
       'filepath': 'tools/android/loading/'
@@ -114,6 +108,9 @@
     'arc_auth': {
       'filepath': 'chrome/browser/chromeos/arc/arc_auth'
     },
+    'arc_fileapi': {
+      'filepath': 'chrome/browser/chromeos/arc/fileapi'
+    },
     'arc_kiosk': {
       'filepath': 'chrome/browser/chromeos/app_mode/arc/'\
                   '|components/arc/kiosk/'\
@@ -149,12 +146,10 @@
     'autofill': {
       'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/autofill/|'\
                   'chrome/browser/autofill/|'\
-                  'chrome/browser/resources/options/autofill_|'\
                   'chrome/browser/ui/android/autofill/|'\
                   'chrome/browser/ui/autofill/|'\
                   'chrome/browser/ui/cocoa/autofill/|'\
                   'chrome/browser/ui/views/autofill/|'\
-                  'chrome/browser/ui/webui/options/autofill_|'\
                   'chrome/renderer/autofill/|'\
                   'chrome/test/data/autofill/|'\
                   'components/autofill/|'\
@@ -162,10 +157,11 @@
                   'components/webdata/',
     },
     'background_fetch': {
-      'filepath': 'background_fetch',
+      'filepath': 'background_fetch|'\
+                  'background-fetch',
     },
     'background_sync': {
-      'filepath': 'background_sync',
+      'filepath': '/background_sync/',
     },
     'banners': {
       'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/banners/|'\
@@ -200,6 +196,386 @@
       'filepath': 'build/android/binary_size/|'\
                   'tools/binary_size/',
     },
+    'blink': {
+      'filepath': 'third_party/(WebKit|blink)/',
+    },
+    'blink_accessibility': {
+      'filepath': 'third_party/WebKit/.*(accessibility|AXObjectCache|WebAX)'
+    },
+    'blink_animation': {
+      'filepath': 'third_party/WebKit/.*([Aa]nimat|[Tt]ransition)',
+    },
+    'blink_app_banner': {
+      'filepath': 'third_party/WebKit/Source/modules/app_banner' \
+                  '|third_party/WebKit/public/platform/modules/app_banner',
+    },
+    'blink_audio': {
+      'filepath': 'third_party/WebKit/Source/platform/audio' \
+                  '|third_party/WebKit/Source/modules/webaudio',
+    },
+    'blink_battery_status': {
+      'filepath': 'third_party/WebKit/Source/modules/battery/' \
+                  '|third_party/WebKit/LayoutTests/battery-status/' \
+                  '|third_party/WebKit/Source/core/frame/PlatformEvent(Controller|Dispatcher)'
+    },
+    'blink_bidi': {
+      'filepath': 'third_party/WebKit/Source/platform/text/.*Bidi' \
+                  '|third_party/WebKit/Source/core/rendering/.*Bidi',
+    },
+    'blink_bindings': {
+      'filepath': 'third_party/WebKit/Source/platform/bindings' \
+                  '|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'
+    },
+    'blink_canvas2d': {
+      'filepath': 'third_party/WebKit/Source/core/html/canvas' \
+                  '|third_party/WebKit/Source/core/html/HTMLCanvasElement' \
+                  '|third_party/WebKit/Source/modules/canvas2d' \
+                  '|third_party/WebKit/Source/platform/graphics/Canvas2D',
+    },
+    'blink_client_hints': {
+      'filepath': 'third_party/WebKit/Source/core/loader/AcceptClientHints*' \
+                  '|third_party/WebKit/Source/core/loader/FrameFetchContext*' \
+                  '|third_party/WebKit/Source/core/fetch/FetchContext*' \
+                  '|third_party/WebKit/Source/core/fetch/ImageResource*' \
+                  '|third_party/WebKit/Source/core/fetch/ResourceFetcher*'
+    },
+    'blink_clipboard': {
+      'filepath': 'third_party/WebKit/Source/core/clipboard' \
+                  '|third_party/WebKit/Source/core/page/.*Drag' \
+                  '|third_party/WebKit/Source/platform/.*Drag' \
+                  '|third_party/WebKit/Source/platform/clipboard' \
+                  '|third_party/WebKit/Source/web/.*Drag' \
+                  '|third_party/WebKit/public/platform/.*Drag' \
+                  '|third_party/WebKit/public/web/.*Drag',
+    },
+    'blink_controller': {
+      'filepath': 'third_party/WebKit/Source/controller',
+    },
+    'blink_css': {
+      'filepath': 'third_party/WebKit/Source/core/css',
+    },
+    'blink_css_flexbox': {
+      'filepath': 'third_party/WebKit/Source/core/rendering/.*Flex' \
+                  '|third_party/WebKit/LayoutTests/fast/deprecated-flexbox/' \
+                  '|third_party/WebKit/LayoutTests/css3/flexbox/' \
+                  '|third_party/WebKit/LayoutTests/ietestcenter/css3/flexbox/'
+    },
+    'blink_css_fragmentation_tests': {
+      'filepath': 'third_party/WebKit/LayoutTests/fast/multicol/' \
+                  '|third_party/WebKit/LayoutTests/fast/pagination/' \
+                  '|third_party/WebKit/LayoutTests/printing/'
+    },
+    'blink_css_grid_layout': {
+      'filepath': 'third_party/WebKit/Source/core/layout/.*Grid' \
+                  '|third_party/WebKit/Source/core/paint/.*Grid' \
+                  '|third_party/WebKit/Source/core/css/.*Grid' \
+                  '|third_party/WebKit/LayoutTests/fast/css-grid-layout/' \
+                  '|third_party/WebKit/LayoutTests/ietestcenter/css3/grid/' \
+                  '|third_party/WebKit/LayoutTests/platform/.*/fast/css-grid-layout/' \
+                  '|third_party/WebKit/LayoutTests/platform/.*/ietestcenter/css3/grid/'
+    },
+    'blink_css_regions': {
+      'filepath': 'third_party/WebKit/Source/core/rendering/.*(Region|FlowThread)' \
+                  '|third_party/WebKit/Source/core/dom/NodeRendering' \
+                  '|third_party/WebKit/Source/core/dom/.*NamedFlow' \
+                  '|third_party/WebKit/Source/core/css/.*Region' \
+                  '|third_party/WebKit/LayoutTests/compositing/regions/' \
+                  '|third_party/WebKit/LayoutTests/fast/regions/' \
+                  '|third_party/WebKit/LayoutTests/platform/chromium.*/fast/regions/'
+    },
+    'blink_custom_elements': {
+      'filepath': 'third_party/WebKit/Source/core/html/custom/' \
+                  '|third_party/WebKit/Source/bindings/core/v8/.*CustomElement',
+    },
+    'blink_device_orientation': {
+      'filepath': 'third_party/WebKit/Source/modules/device_orientation/' \
+                  '|third_party/WebKit/LayoutTests/device_orientation/' \
+                  '|third_party/WebKit/Source/core/frame/PlatformEvent(Controller|Dispatcher)' \
+                  '|third_party/WebKit/Source/core/frame/DeviceSingleWindowEventController'
+    },
+    'blink_devtools': {
+      'filepath': 'third_party/WebKit/.*(inspector|DevTools|devtools)',
+    },
+    'blink_dom': {
+      'filepath': 'third_party/WebKit/Source/core/dom/'
+    },
+    'blink_dom_events': {
+      'filepath': 'third_party/WebKit/Source/core/events/Event\.' \
+                  '|third_party/WebKit/Source/core/events/EventInit' \
+                  '|third_party/WebKit/Source/core/events/EventPath' \
+                  '|third_party/WebKit/Source/core/events/EventListener' \
+                  '|third_party/WebKit/Source/core/events/EventDispatcher' \
+                  '|third_party/WebKit/Source/core/events/EventDispatchMediator' \
+                  '|third_party/WebKit/Source/core/events/EventTarget' \
+                  '|third_party/WebKit/Source/core/events/.*EventContext'
+    },
+    'blink_events': {
+      'filepath': 'third_party/WebKit/Source/core/page/.*Event' \
+                  '|third_party/WebKit/Source/core/dom/.*Event' \
+                  '|third_party/WebKit/Source/core/css/.*Event' \
+                  '|third_party/WebKit/Source/platform/.*Event'
+    },
+    'blink_fetch': {
+      'filepath': 'third_party/WebKit/Source/platform/loader/fetch'
+    },
+    'blink_fetch_api': {
+      'filepath': 'third_party/WebKit/Source/core/xmlhttprequest/' \
+                  '|third_party/WebKit/Source/modules/beacon/' \
+                  '|third_party/WebKit/Source/modules/eventsource/' \
+                  '|third_party/WebKit/Source/modules/fetch/'
+    },
+    'blink_fileapi': {
+      'filepath': 'third_party/WebKit/Source/modules/filesystem/' \
+                  '|third_party/WebKit/Source/core/fileapi/' \
+                  '|third_party/WebKit/Source/platform/.*File' \
+                  '|third_party/WebKit/Source/web/.*File' \
+                  '|third_party/WebKit/LayoutTests/fast/file' \
+                  '|third_party/WebKit/public/.*File'
+    },
+    'blink_frames': {
+      'filepath': 'third_party/WebKit/Source/core/frame/'
+    },
+    'blink_geolocation': {
+      'filepath': 'third_party/WebKit/LayoutTests/geolocation-api/' \
+                  '|third_party/WebKit/Source/modules/geolocation/' \
+                  '|third_party/WebKit/Source/web/.*Geolocation' \
+                  '|third_party/WebKit/public/web/.*Geolocation'
+    },
+    'blink_heap': {
+      'filepath': 'third_party/WebKit/Source/platform/heap' \
+                  '|base/allocator/partition_allocator/'
+    },
+    'blink_html': {
+      'filepath': 'third_party/WebKit/Source/core/html/'
+    },
+    'blink_htmlparser': {
+      'filepath': 'third_party/WebKit/Source/core/html/parser/'
+    },
+    'blink_image_capture': {
+      'filepath': 'third_party/WebKit/Source/modules/imagecapture' \
+                  '|third_party/WebKit/LayoutTests/fast/imagecapture/' \
+                  '|third_party/WebKit/LayoutTests/imagecapture/'
+    },
+    'blink_indexed_db': {
+      'filepath': 'third_party/WebKit/Source/modules/indexeddb/' \
+                  '|third_party/WebKit/Source/web/.*IDB' \
+                  '|third_party/WebKit/LayoutTests/storage/indexeddb' \
+                  '|third_party/WebKit/public/platform/.*IDB'
+    },
+    'blink_input': {
+      'filepath': 'third_party/WebKit/Source/core/input/'
+    },
+    'blink_layers': {
+      'filepath': 'third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator' \
+                  '|third_party/WebKit/Source/platform/graphics/GraphicsLayer' \
+                  '|third_party/WebKit/Source/core/layout/Layer'
+    },
+    'blink_layout': {
+      '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_layout_ng_test_expectations': {
+      'filepath': 'third_party/WebKit/LayoutTests/FlagExpectations/enable-blink-features=LayoutNG' \
+                  '|third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG'
+    },
+    'blink_loader': {
+      'filepath': 'third_party/WebKit/Source/core/loader/' \
+                  '|third_party/WebKit/Source/platform/loader/'
+    },
+    'blink_media': {
+      'filepath': 'third_party/WebKit/Source/core/css/mediaControls' \
+                  '|third_party/WebKit/Source/core/html/.*(Audio|Media|Video)' \
+                  '|third_party/WebKit/Source/core/html/shadow/MediaControl' \
+                  '|third_party/WebKit/Source/core/layout/LayoutMedia' \
+                  '|third_party/WebKit/Source/core/layout/LayoutTextTrackContainerElement' \
+                  '|third_party/WebKit/Source/modules/(encryptedmedia|mediasource)' \
+                  '|third_party/WebKit/Source/platform/drm/' \
+                  '|third_party/WebKit/Source/platform/graphics/media/' \
+                  '|third_party/WebKit/Source/web/.*Media' \
+                  '|third_party/WebKit/LayoutTests/media/' \
+                  '|third_party/WebKit/public/.*Media'
+    },
+    'blink_media_queries': {
+      'filepath': 'third_party/WebKit/Source/core/css/CSSMediaRule' \
+                    '|third_party/WebKit/Source/core/css/MediaList' \
+                    '|third_party/WebKit/Source/core/css/MediaQuery' \
+                    '|third_party/WebKit/Source/core/css/parser/MediaQuery'
+    },
+    'blink_mediastream': {
+      'filepath': 'third_party/WebKit/Source/modules/mediastream/' \
+                  '|third_party/WebKit/Source/platform/mediastream/' \
+                  '|third_party/WebKit/Source/platform/exported/WebMediaStream' \
+                  '|third_party/WebKit/Source/platform/exported/WebRTC' \
+                  '|third_party/WebKit/LayoutTests/fast/mediastream/'
+    },
+    'blink_modules': {
+      'filepath': 'third_party/WebKit/Source/modules'
+    },
+    'blink_navigator_content_utils': {
+      'filepath': 'third_party/WebKit/Source/modules/navigatorcontentutils' \
+                  '|third_party/WebKit/LayoutTests/fast/dom/navigatorcontentutils'
+    },
+    'blink_out_of_process_frames': {
+      'filepath': 'third_party/WebKit/Source/core/frame/FrameOwner' \
+                  '|third_party/WebKit/Source/core/frame/Frame\.' \
+                  '|third_party/WebKit/Source/web/WebFrame' \
+                  '|third_party/WebKit/Source/web/WebRemoteFrameImpl'
+    },
+    'blink_owners': {
+      'filepath': 'third_party/(WebKit|blink)/.*OWNERS',
+    },
+    'blink_paint': {
+      'filepath': 'third_party/WebKit/Source/core/paint/'
+    },
+    'blink_performance_timing': {
+      'filepath': 'third_party/WebKit/Source/core/timing/'
+    },
+    'blink_permissions': {
+      'filepath': 'third_party/WebKit/Source/modules/permissions/' \
+                  '|third_party/WebKit/public/platform/modules/permissions/',
+    },
+    'blink_platform': {
+      'filepath': 'third_party/WebKit/Source/platform'
+    },
+    'blink_platform_graphics': {
+      'filepath': 'third_party/WebKit/Source/platform/fonts' \
+                  '|third_party/WebKit/Source/platform/geometry' \
+                  '|third_party/WebKit/Source/platform/graphics'
+    },
+    'blink_preloadScanner': {
+      'filepath': 'third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner',
+    },
+    'blink_prerender': {
+      'filepath': 'third_party/WebKit/.*(Prerender|loader/LinkLoader|html/HTMLLinkElement)'
+    },
+    'blink_public_api': {
+      'filepath': 'third_party/WebKit/public'
+    },
+    'blink_quota': {
+      'filepath': 'third_party/WebKit/Source/modules/quota/' \
+                  '|third_party/WebKit/Source/web/.*Quota' \
+                  '|third_party/WebKit/public/.*Quota'
+    },
+    'blink_scheduler': {
+      'filepath': 'third_party/WebKit/Source/platform/scheduler' \
+                  '|third_party/WebKit/Source/core/html/parser/.*Scheduler'
+    },
+    'blink_screen_orientation': {
+      'filepath': 'third_party/WebKit/Source/modules/screen_orientation/' \
+                  '|third_party/WebKit/public/platform/modules/screen_orientation',
+    },
+    'blink_script': {
+      'filepath': 'third_party/WebKit/Source/bindings/core/v8/.*Module.*' \
+                  '|third_party/WebKit/Source/bindings/core/v8/ScriptController.*' \
+                  '|third_party/WebKit/Source/bindings/core/v8/ScriptSourceCode.*' \
+                  '|third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.*'
+                  '|third_party/WebKit/Source/core/dom/.*Modul.*' \
+                  '|third_party/WebKit/Source/core/dom/.*Script.*' \
+                  '|third_party/WebKit/Source/core/html/HTMLScriptElement.*' \
+                  '|third_party/WebKit/Source/core/html/parser/HTMLParserScriptRunner.*' \
+                  '|third_party/WebKit/Source/core/loader/modulescript/' \
+                  '|third_party/WebKit/Source/core/loader/resource/ScriptResource.*' \
+                  '|third_party/WebKit/Source/core/svg/SVGScriptElement.*' \
+                  '|third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.*'
+    },
+    'blink_serviceworkers' : {
+      'filepath': 'third_party/WebKit/Source/modules/serviceworkers' \
+                  '|third_party/WebKit/LayoutTests/http/tests/serviceworker' \
+                  '|third_party/WebKit/LayoutTests/external/wpt/service-workers'
+    },
+    'blink_serviceworkers_tests' : {
+      'filepath': 'third_party/WebKit/LayoutTests/http/tests/serviceworker' \
+                  '|third_party/WebKit/LayoutTests/external/wpt/service-workers'
+    },
+    'blink_shadow_dom': {
+      'filepath': 'third_party/WebKit/Source/core/dom/.*Shadow' \
+                  '|third_party/WebKit/Source/core/dom/.*Slot' \
+                  '|third_party/WebKit/Source/core/dom/.*InsertionPoint' \
+                  '|third_party/WebKit/Source/core/dom/.*FlatTree'
+    },
+    'blink_spellcheck' : {
+      'filepath': 'third_party/WebKit/Source/core/editing/spellcheck'
+    },
+    'blink_spv2_layout_tests': {
+      'filepath': 'third_party/WebKit/LayoutTests/virtual/spv2'
+    },
+    'blink_streams': {
+      'filepath': 'third_party/WebKit/Source/core/streams/'
+    },
+    'blink_style': {
+      'filepath': 'third_party/WebKit/.*(style/|Style)',
+    },
+    'blink_svg': {
+      'filepath': 'third_party/WebKit/Source/core/(layout/)?svg',
+    },
+    'blink_track': {
+      'filepath': 'third_party/WebKit/Source/core/html/track/' \
+                  '|third_party/WebKit/Source/core/loader/TextTrack' \
+                  '|third_party/WebKit/Source/core/html/HTMLMediaElement' \
+                  '|third_party/WebKit/Source/core/html/HTMLTrackElement' \
+                  '|third_party/WebKit/Source/core/html/shadow/MediaControl' \
+                  '|third_party/WebKit/Source/core/css/mediaControl' \
+                  '|third_party/WebKit/LayoutTests/media/track/'
+    },
+    'blink_url_api': {
+      'filepath': 'third_party/WebKit/Source/core/url/'
+    },
+    'blink_vibration': {
+      'filepath': 'third_party/WebKit/LayoutTests/vibration/' \
+                  '|third_party/WebKit/Source/modules/vibration/'
+    },
+    'blink_viewport_interaction': {
+      'filepath': 'third_party/WebKit/Source/core/css/.*Viewport' \
+                  '|third_party/WebKit/Source/core/dom/ViewportArguments' \
+                  '|third_party/WebKit/Source/core/html/HTMLMetaElement' \
+                  '|third_party/WebKit/Source/core/page/FrameView' \
+                  '|third_party/WebKit/Source/core/page/scrolling'
+    },
+    'blink_w3ctests': {
+      'filepath': 'third_party/WebKit/LayoutTests/external/' \
+                  '|third_party/WebKit/Tools/Scripts/webkitpy/w3c/'
+    },
+    'blink_web': {
+      'filepath': 'third_party/WebKit/Source/web'
+    },
+    'blink_webcomponents': {
+      'filepath': 'third_party/WebKit/Source/core/dom/.*Shadow' \
+                  '|third_party/WebKit/Source/core/dom/.*Slot' \
+                  '|third_party/WebKit/Source/core/dom/.*InsertionPoint' \
+                  '|third_party/WebKit/Source/core/dom/.*FlatTree' \
+                  '|third_party/WebKit/Source/core/html/custom/' \
+                  '|third_party/WebKit/Source/core/html/imports/' \
+                  '|third_party/WebKit/Source/bindings/core/v8/.*CustomElement'
+    },
+    'blink_webp': {
+      'filepath': 'third_party/WebKit/Source/platform/image-decoders/webp' \
+                  '|third_party/WebKit/Source/platform/image-encoders/skia/WEBP'
+    },
+    'blink_websockets': {
+      'filepath': 'third_party/WebKit/Source/modules/websockets/' \
+                  '|third_party/WebKit/Source/platform/modules/websockets/'
+    },
+    'blink_workers': {
+      'filepath': 'third_party/WebKit/Source/core/workers' \
+                  '|third_party/WebKit/LayoutTests/http/tests/workers' \
+                  '|third_party/WebKit/LayoutTests/fast/workers' \
+                  '|third_party/WebKit/LayoutTests/external/wpt/workers'
+    },
+    'blink_wtf': {
+      'filepath': 'third_party/WebKit/Source/wtf',
+    },
+    'blink_xml': {
+      'filepath': 'third_party/WebKit/Source/core/xml/'
+    },
     'bookmarks': {
       'filepath': 'chrome/browser/bookmarks/' \
                   '|chrome/browser/extensions/api/bookmark_manager_private/' \
@@ -213,12 +589,6 @@
     'bottombar': {
       'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/',
     },
-    'breakpad_app': {
-      'filepath': 'components/crash/content/app/',
-    },
-    'browser': {
-      'filepath': 'chrome/browser/',
-    },
     'browser_chromeos': {
       'filepath': 'chrome/browser/chromeos/',
     },
@@ -233,9 +603,6 @@
     'browser_compositor': {
       'filepath': 'ui/compositor/'
     },
-    'browser_resources': {
-      'filepath': 'chrome/browser/resources/',
-    },
     'browser_resources_md': {
       'filepath': 'chrome/browser/resources/md_'\
                   '|chrome/browser/resources/settings/',
@@ -249,7 +616,8 @@
                   'components/bubble/',
     },
     'cache_storage': {
-      'filepath': 'cache_storage',
+      'filepath': '/cache.storage/'
+                  '|/cachestorage/',
     },
     'cast': {
       'filepath': 'media/cast/'\
@@ -266,7 +634,12 @@
     },
     'cast_channel': {
       'filepath':  'chrome/test/data/extensions/api_test/cast_channel/' \
-                   '|extensions/(browser|common)/api/cast_channel'
+                   '|components/cast_channel/' \
+                   '|extensions/browser/api/cast_channel'
+    },
+    'cc': {
+      'filepath': 'cc/|'\
+                  'components/viz/'
     },
     'certificate_transparency': {
       'filepath': 'components/certificate_transparency/'\
@@ -277,16 +650,6 @@
                   '|net/cert/signed_tree_head'\
                   '|net/test/ct_',
     },
-    'chromecast': {
-      'filepath': 'chromecast/',
-    },
-    'chromecast_public': {
-      'filepath': 'chromecast/public/',
-    },
-    'cc': {
-      'filepath': 'cc/|'\
-                  'components/viz/'
-    },
     'chrome_elf': {
       'filepath': 'chrome_elf',
     },
@@ -297,6 +660,12 @@
     'chrome_views': {
       'filepath': 'chrome/browser/ui/views',
     },
+    'chromecast': {
+      'filepath': 'chromecast/',
+    },
+    'chromecast_public': {
+      'filepath': 'chromecast/public/',
+    },
     'chromedriver': {
       'filepath': 'chrome/test/chromedriver|'\
                   'chrome/test/data/chromedriver|'\
@@ -367,12 +736,18 @@
                   'content/browser/loader|' \
                   'content/child/*loader',
     },
+    'content_network' : {
+      'filepath': 'content/network/',
+    },
     'content_renderer': {
       'filepath': 'content/renderer/',
     },
     'content_shell': {
       'filepath': 'content/shell/',
     },
+    'content_websockets': {
+      'filepath': 'content/browser/websockets/',
+    },
     'content_worker': {
       'filepath': 'content/.*worker',
     },
@@ -382,16 +757,12 @@
                   'chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/|' \
                   'components/contextual_search/',
     },
-    'content_network' : {
-      'filepath': 'content/network/',
-    },
-    'cookie_monster': {
-      'filepath': 'net/cookies/|'\
-                  'chrome/browser/net/sqlite_persistent_cookie_store',
-    },
     'courgette': {
       'filepath': 'courgette/',
     },
+    'cq': {
+      'filepath': 'infra/config/cq.cfg',
+    },
     'cr_elements': {
       'filepath': 'ui/webui/resources/cr_element',
     },
@@ -407,6 +778,9 @@
     'deep_memory_profiler': {
       'filepath': 'tools/(deep_memory_profiler|find_runtime_symbols)',
     },
+    'developer_recommended_flags': {
+      'filepath': 'developer_recommended_flags.gypi',
+    },
     'device_bluetooth': {
       'filepath': 'device/.*bluetooth'
     },
@@ -432,9 +806,6 @@
                   'content/test/data/device_sensors/|'\
                   'device/sensors/',
     },
-    'developer_recommended_flags': {
-      'filepath': 'developer_recommended_flags.gypi',
-    },
     'devtools': {
       'filepath': 'devtools',
     },
@@ -531,18 +902,15 @@
                   'content/renderer/geolocation.*|'\
                   'content/shell/geolocation/',
     },
-    'gfx_image': {
-      'filepath': 'ui/gfx/image/',
-    },
     'gfx_geometry': {
       'filepath': 'ui/gfx/geometry/',
     },
+    'gfx_image': {
+      'filepath': 'ui/gfx/image/',
+    },
     'gn': {
       'filepath': 'tools/gn',
     },
-    'goma': {
-      'filepath': 'infra/config/cq.cfg',
-    },
     'gpu': {
       'filepath': 'gpu/',
     },
@@ -564,6 +932,9 @@
     'importer': {
       'filepath': 'import',
     },
+    'incident_reporting': {
+      'filepath': 'chrome/browser/safe_browsing/incident_reporting',
+    },
     'indexed_db': {
       'filepath': 'content/browser/indexed_db|'\
                   'content/child/indexed_db|'\
@@ -583,12 +954,13 @@
     'installable': {
       'filepath': 'chrome/browser/installable/',
     },
-    'installer': {
-      'filepath': 'chrome/install(_static|er)/',
-    },
     'installer_linux': {
       'filepath': 'chrome/installer/linux/',
     },
+    'installer_win': {
+      'filepath': 'chrome/install_static/'\
+                  '|chrome/installer/(?!gcapi_mac/|linux/|mac/)',
+    },
     'instant': {
       'filepath': 'instant|searchbox|'\
                   'chrome/browser/search/|'\
@@ -620,19 +992,12 @@
     'ipc': {
       'filepath': 'ipc/ipc',
     },
-    'ipc_messages': {
-      'filepath': '_message.*.h|'\
-                  '_messages.cc',
-    },
-    'login': {
-      'filepath': 'chrome/browser/ui/login'
+    'libvpx': {
+      'filepath': 'third_party/libvpx'
     },
     'libwebp': {
       'filepath': 'third_party/libwebp'
     },
-    'libvpx': {
-      'filepath': 'third_party/libvpx'
-    },
     'libxml_xslt': {
       'filepath': 'third_party/libxml/' \
                   '|third_party/libxslt/',
@@ -648,6 +1013,9 @@
     'linux_seccomp_bpf': {
       'filepath': 'content/common/sandbox.*linux.cc',
     },
+    'login': {
+      'filepath': 'chrome/browser/ui/login'
+    },
     'mac': {
       'filepath': '(_|/)(cocoa|mac)(_|\.)|/(cocoa|mac)/|^((?!ios\/).)*\.mm?$',
     },
@@ -661,8 +1029,7 @@
                   '|chrome/test/data/webui/settings/',
     },
     'media': {
-      'filepath': 'media/|third_party/(ffmpeg|openmax)/|webmediaplayer|'\
-        'audio_message_filter|video_layer|media_internals',
+      'filepath': 'media|third_party/(ffmpeg|opus|libvpx)'
     },
     'media_capture_from_element': {
       'filepath': 'content/renderer/media_capture_from_element/' \
@@ -782,29 +1149,32 @@
     'net_spdy': {
       'filepath': 'net/spdy/',
     },
+    'net_websockets': {
+      'filepath': 'net/websockets/' \
+                  '|net/data/websocket/'
+    },
     'netinfo': {
-      'filepath': 'netinfo',
+      'filepath': '/netinfo/',
     },
     'notifications': {
-      'filepath': 'chrome/browser/extensions/api/notifications/|' \
-        'chrome/browser/notifications/|' \
-        'chrome/test/data/notifications/|' \
-        'content/browser/notifications/|' \
-        'content/child/notifications/|' \
-        'content/common/platform_notification|' \
-        'content/public/browser/platform_notification|' \
-        'content/public/common/platform_notification|' \
-        'content/renderer/notification_|' \
+      'filepath': 'chrome/browser/extensions/api/notifications/|'\
+        'chrome/browser/notifications/|'\
+        'chrome/test/data/notifications/|'\
+        'content/browser/notifications/|'\
+        'content/child/notifications/|'\
+        'content/common/platform_notification|'\
+        'content/public/browser/platform_notification|'\
+        'content/public/common/platform_notification|'\
+        'content/renderer/notification_|'\
+        'third_party/WebKit/LayoutTests/external/wpt/notifications|'\
+        'third_party/WebKit/LayoutTests/http/tests/notifications|'\
+        'third_party/WebKit/Source/modules/notifications|'\
+        'third_party/WebKit/public/platform/modules/notifications|'\
         'ui/message_center/'
     },
     'nqe': {
       'filepath': 'nqe',
     },
-    'ntp': {
-      'filepath': 'chrome/browser/resources/ntp4/|'\
-        'chrome/browser/resources/ntp_android/|'\
-        'chrome/browser/ui/webui/ntp/',
-    },
     'ntp_snippets': {
       'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/ntp/|'\
         'chrome/android/javatests/src/org/chromium/chrome/browser/ntp/|'\
@@ -844,10 +1214,6 @@
                   'components/omnibox/|'\
                   'ios/chrome/browser/ui/omnibox/'
     },
-    'options': {
-      'filepath': 'chrome/browser/resources/options/|'\
-          'chrome/browser/ui/webui/options/',
-    },
     'origin_trials': {
       'filepath': 'origin_trials'\
                   '|OriginTrial'\
@@ -972,15 +1338,6 @@
     'safe_browsing_db': {
       'filepath': 'components/safe_browsing_db/',
     },
-    'sandbox': {
-      'filepath': 'sandbox/'\
-                  '|content/browser/bootstrap_sandbox_mac'\
-                  '|content/browser/renderer_host/render_sandbox_host_linux'\
-                  '|content/browser/renderer_host/sandbox_ipc_linux'\
-                  '|content/browser/zygote_host/'\
-                  '|content/common/sandbox_'\
-                  '|content/zygote/'\
-    },
     'scheduler': {
       'filepath': 'cc/scheduler'\
                   '|components/scheduler'\
@@ -989,9 +1346,6 @@
     'screen_orientation': {
       'filepath': 'screen_orientation',
     },
-    'search': {
-      'filepath': 'chrome/browser/ui/search/',
-    },
     'service_worker': {
       'filepath': 'content/(browser|renderer|child|common)/service_worker/',
     },
@@ -1010,12 +1364,6 @@
       'filepath': 'content/browser/site_instance|'\
         'content/browser/browsing_instance',
     },
-    'speech': {
-      'filepath': 'chrome/browser/speech/'\
-                  '|content/browser/speech/'\
-                  '|content/common/.*speech'\
-                  '|content/public/.*speech'
-    },
     'spellcheck': {
       'filepath': 'chrome/browser/spellchecker/'\
                   '|chrome/browser/renderer_context_menu/spelling_'\
@@ -1087,9 +1435,6 @@
         'content/browser/tab_contents/|'\
         'chrome/browser/ui/tab_contents/',
     },
-    'task_manager': {
-      'filepath': 'task_manager'
-    },
     'tbmv2_metrics': {
       'filepath': 'third_party/catapult/tracing/tracing/metrics'
     },
@@ -1099,6 +1444,12 @@
     'telemetry': {
       'filepath': 'tools/perf/'
     },
+    'test_runner': {
+      'filepath': 'components/test_runner/' \
+                  '|content/shell/(common|browser|renderer)/layout_test/' \
+                  '|content/test/layouttest_support.cc' \
+                  '|content/public/test/layouttest_support.h' \
+    },
     'tests': {
       'filepath': 'apitest|unittest|browsertest|uitest|chrome/test/',
     },
@@ -1126,19 +1477,13 @@
                   '|chrome/browser/chromeos/status/input_method'\
                   '|chrome/browser/extensions/extension_input_'\
                   '|chrome/browser/resources/keyboard'\
-                  '|chrome/browser/resources/options/language'\
-                  '|chrome/browser/ui/webui/options/'\
                   'chromeos/.*(language|keyboard)'\
-                  '|chrome/browser/ui/webui/options/language'\
                   '|chromeos/ime/*'
     },
     'timers': {
       'filepath': 'base/timer/'\
                   '|components/timers/'
     },
-    'tools': {
-      'filepath': 'tools/',
-    },
     'tools_win_chromeexts': {
       'filepath': 'tools/win/chromeexts',
     },
@@ -1195,9 +1540,6 @@
       # Applies to all files and subdirs within this directory.
       'filepath': '^ui/views/',
     },
-    'views_corewm': {
-      'filepath': 'ui/views/corewm/',
-    },
     'virtual_keyboard': {
       'filepath': 'ui/keyboard/'\
                   '|chrome/test/data/chromeos/virtual_keyboard/'\
@@ -1210,6 +1552,16 @@
                   '/vr/|'\
                   'third_party/gvr',
     },
+    'web_share': {
+      'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/webshare/'\
+                  '|chrome/android/javatests/src/org/chromium/chrome/browser/WebShare.*'\
+                  '|chrome/browser/ui/views/webshare/'\
+                  '|chrome/browser/webshare/'\
+                  '|third_party/WebKit/LayoutTests/webshare/'\
+                  '|third_party/WebKit/LayoutTests/external/wpt/web-share/'\
+                  '|third_party/WebKit/public/platform/modules/webshare/'\
+                  '|third_party/WebKit/Source/modules/webshare/',
+    },
     'webrtc_browser_tests': {
       'filepath': 'chrome/browser/media/.*webrtc.*browsertest|'\
                   'content/browser/media/.*webrtc.*browsertest',
@@ -1241,391 +1593,6 @@
                   '|content/public/browser/host_zoom_map.h' \
                   '|content/public/browser/storage_partition.h'
     },
-
-    'blink': {
-      'filepath': 'third_party/WebKit/',
-    },
-    'blink_accessibility': {
-      'filepath': 'third_party/WebKit/.*(accessibility|AXObjectCache|WebAX)'
-    },
-    'blink_animation': {
-      'filepath': 'third_party/WebKit/.*([Aa]nimat|[Tt]ransition)',
-    },
-    'blink_app_banner': {
-      'filepath': 'third_party/WebKit/Source/modules/app_banner' \
-                  '|third_party/WebKit/public/platform/modules/app_banner',
-    },
-    'blink_audio': {
-      'filepath': 'third_party/WebKit/Source/platform/audio' \
-                  '|third_party/WebKit/Source/modules/webaudio',
-    },
-    'blink_battery_status': {
-      'filepath': 'third_party/WebKit/Source/modules/battery/' \
-                  '|third_party/WebKit/LayoutTests/battery-status/' \
-                  '|third_party/WebKit/Source/core/frame/PlatformEvent(Controller|Dispatcher)'
-    },
-    'blink_bidi': {
-      'filepath': 'third_party/WebKit/Source/platform/text/.*Bidi' \
-                  '|third_party/WebKit/Source/core/rendering/.*Bidi',
-    },
-    'blink_bindings': {
-      'filepath': 'third_party/WebKit/Source/platform/bindings' \
-                  '|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'
-    },
-    'blink_canvas2d': {
-      'filepath': 'third_party/WebKit/Source/core/html/canvas' \
-                  '|third_party/WebKit/Source/core/html/HTMLCanvasElement' \
-                  '|third_party/WebKit/Source/modules/canvas2d' \
-                  '|third_party/WebKit/Source/platform/graphics/Canvas2D',
-    },
-    'blink_clipboard': {
-      'filepath': 'third_party/WebKit/Source/core/clipboard' \
-                  '|third_party/WebKit/Source/core/page/.*Drag' \
-                  '|third_party/WebKit/Source/platform/.*Drag' \
-                  '|third_party/WebKit/Source/platform/clipboard' \
-                  '|third_party/WebKit/Source/web/.*Drag' \
-                  '|third_party/WebKit/public/platform/.*Drag' \
-                  '|third_party/WebKit/public/web/.*Drag',
-    },
-    'blink_content_security_policy': {
-      'filepath': 'third_party/WebKit/Source/core/frame/csp' \
-                  '|third_party/WebKit/Source/core/events/SecurityPolicyViolationEvent' \
-                  '|third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy'
-    },
-    'blink_css': {
-      'filepath': 'third_party/WebKit/Source/core/css',
-    },
-    'blink_css_grid_layout': {
-      'filepath': 'third_party/WebKit/Source/core/layout/.*Grid' \
-                  '|third_party/WebKit/Source/core/paint/.*Grid' \
-                  '|third_party/WebKit/Source/core/css/.*Grid' \
-                  '|third_party/WebKit/LayoutTests/fast/css-grid-layout/' \
-                  '|third_party/WebKit/LayoutTests/ietestcenter/css3/grid/' \
-                  '|third_party/WebKit/LayoutTests/platform/.*/fast/css-grid-layout/' \
-                  '|third_party/WebKit/LayoutTests/platform/.*/ietestcenter/css3/grid/'
-    },
-    'blink_css_flexbox': {
-      'filepath': 'third_party/WebKit/Source/core/rendering/.*Flex' \
-                  '|third_party/WebKit/LayoutTests/fast/deprecated-flexbox/' \
-                  '|third_party/WebKit/LayoutTests/css3/flexbox/' \
-                  '|third_party/WebKit/LayoutTests/ietestcenter/css3/flexbox/'
-    },
-    'blink_css_fragmentation_tests': {
-      'filepath': 'third_party/WebKit/LayoutTests/fast/multicol/' \
-                  '|third_party/WebKit/LayoutTests/fast/pagination/' \
-                  '|third_party/WebKit/LayoutTests/printing/'
-    },
-    'blink_css_regions': {
-      'filepath': 'third_party/WebKit/Source/core/rendering/.*(Region|FlowThread)' \
-                  '|third_party/WebKit/Source/core/dom/NodeRendering' \
-                  '|third_party/WebKit/Source/core/dom/.*NamedFlow' \
-                  '|third_party/WebKit/Source/core/css/.*Region' \
-                  '|third_party/WebKit/LayoutTests/compositing/regions/' \
-                  '|third_party/WebKit/LayoutTests/fast/regions/' \
-                  '|third_party/WebKit/LayoutTests/platform/chromium.*/fast/regions/'
-    },
-    'blink_custom_elements': {
-      'filepath': 'third_party/WebKit/Source/core/html/custom/' \
-                  '|third_party/WebKit/Source/bindings/core/v8/.*CustomElement',
-    },
-    'blink_device_orientation': {
-      'filepath': 'third_party/WebKit/Source/modules/device_orientation/' \
-                  '|third_party/WebKit/LayoutTests/device_orientation/' \
-                  '|third_party/WebKit/Source/core/frame/PlatformEvent(Controller|Dispatcher)' \
-                  '|third_party/WebKit/Source/core/frame/DeviceSingleWindowEventController'
-    },
-    'blink_devtools': {
-      'filepath': 'third_party/WebKit/.*(inspector|DevTools|devtools)',
-    },
-    'blink_dom': {
-      'filepath': 'third_party/WebKit/Source/core/dom/'
-    },
-    'blink_dom_events': {
-      'filepath': 'third_party/WebKit/Source/core/events/Event\.' \
-                  '|third_party/WebKit/Source/core/events/EventInit' \
-                  '|third_party/WebKit/Source/core/events/EventPath' \
-                  '|third_party/WebKit/Source/core/events/EventListener' \
-                  '|third_party/WebKit/Source/core/events/EventDispatcher' \
-                  '|third_party/WebKit/Source/core/events/EventDispatchMediator' \
-                  '|third_party/WebKit/Source/core/events/EventTarget' \
-                  '|third_party/WebKit/Source/core/events/.*EventContext'
-    },
-    'blink_events': {
-      'filepath': 'third_party/WebKit/Source/core/page/.*Event' \
-                  '|third_party/WebKit/Source/core/dom/.*Event' \
-                  '|third_party/WebKit/Source/core/css/.*Event' \
-                  '|third_party/WebKit/Source/platform/.*Event'
-    },
-    'blink_fetch': {
-      'filepath': 'third_party/WebKit/Source/platform/loader/fetch'
-    },
-    'blink_heap': {
-      'filepath': 'third_party/WebKit/Source/platform/heap' \
-                  '|base/allocator/partition_allocator/'
-    },
-    'blink_html': {
-      'filepath': 'third_party/WebKit/Source/core/html/'
-    },
-    'blink_image_capture': {
-      'filepath': 'third_party/WebKit/Source/modules/imagecapture' \
-                  '|third_party/WebKit/LayoutTests/fast/imagecapture/' \
-                  '|third_party/WebKit/LayoutTests/imagecapture/'
-    },
-    'blink_loader': {
-      'filepath': 'third_party/WebKit/Source/core/loader' \
-                  '|third_party/WebKit/Source/platform/loader'
-    },
-    'blink_modules': {
-      'filepath': 'third_party/WebKit/Source/modules'
-    },
-    'blink_notifications': {
-      'filepath': 'third_party/WebKit/LayoutTests/http/tests/notifications' \
-                  '|third_party/WebKit/Source/modules/notifications' \
-                  '|third_party/WebKit/public/platform/modules/notifications'
-    },
-    'blink_owners': {
-      'filepath': 'third_party/WebKit/.*OWNERS',
-    },
-    'blink_paint': {
-      'filepath': 'third_party/WebKit/Source/core/paint/'
-    },
-    'blink_performance_timing': {
-      'filepath': 'third_party/WebKit/Source/core/timing/'
-    },
-    'blink_permissions': {
-      'filepath': 'third_party/WebKit/Source/modules/permissions/' \
-                  '|third_party/WebKit/public/platform/modules/permissions/',
-    },
-    'blink_preloadScanner': {
-      'filepath': 'third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner',
-    },
-    'blink_public_api': {
-      'filepath': 'third_party/WebKit/public'
-    },
-    'blink_push_messaging': {
-      'filepath': 'third_party/WebKit/LayoutTests/http/tests/push_messaging' \
-                  '|third_party/WebKit/Source/modules/push_messaging' \
-                  '|third_party/WebKit/public/platform/modules/push_messaging'
-    },
-    'blink_platform': {
-      'filepath': 'third_party/WebKit/Source/platform'
-    },
-    'blink_platform_graphics': {
-      'filepath': 'third_party/WebKit/Source/platform/fonts' \
-                  '|third_party/WebKit/Source/platform/geometry' \
-                  '|third_party/WebKit/Source/platform/graphics'
-    },
-    'blink_indexed_db': {
-      'filepath': 'third_party/WebKit/Source/modules/indexeddb/' \
-                  '|third_party/WebKit/Source/web/.*IDB' \
-                  '|third_party/WebKit/LayoutTests/storage/indexeddb' \
-                  '|third_party/WebKit/public/platform/.*IDB'
-    },
-    'blink_input': {
-      'filepath': 'third_party/WebKit/Source/core/input/'
-    },
-    'blink_layout': {
-      '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' \
-                  '|third_party/WebKit/Source/core/layout/Layer'
-    },
-    'blink_prerender': {
-      'filepath': 'third_party/WebKit/.*(Prerender|loader/LinkLoader|html/HTMLLinkElement)'
-    },
-    'blink_client_hints': {
-      'filepath': 'third_party/WebKit/Source/core/loader/AcceptClientHints*' \
-                  '|third_party/WebKit/Source/core/loader/FrameFetchContext*' \
-                  '|third_party/WebKit/Source/core/fetch/FetchContext*' \
-                  '|third_party/WebKit/Source/core/fetch/ImageResource*' \
-                  '|third_party/WebKit/Source/core/fetch/ResourceFetcher*'
-    },
-    'blink_track': {
-      'filepath': 'third_party/WebKit/Source/core/html/track/' \
-                  '|third_party/WebKit/Source/core/loader/TextTrack' \
-                  '|third_party/WebKit/Source/core/html/HTMLMediaElement' \
-                  '|third_party/WebKit/Source/core/html/HTMLTrackElement' \
-                  '|third_party/WebKit/Source/core/html/shadow/MediaControl' \
-                  '|third_party/WebKit/Source/core/css/mediaControl' \
-                  '|third_party/WebKit/LayoutTests/media/track/'
-    },
-    'blink_media': {
-      'filepath': 'third_party/WebKit/Source/core/css/mediaControls' \
-                  '|third_party/WebKit/Source/core/html/.*(Audio|Media|Video)' \
-                  '|third_party/WebKit/Source/core/html/shadow/MediaControl' \
-                  '|third_party/WebKit/Source/core/layout/LayoutMedia' \
-                  '|third_party/WebKit/Source/core/layout/LayoutTextTrackContainerElement' \
-                  '|third_party/WebKit/Source/modules/(encryptedmedia|mediasource)' \
-                  '|third_party/WebKit/Source/platform/drm/' \
-                  '|third_party/WebKit/Source/platform/graphics/media/' \
-                  '|third_party/WebKit/Source/web/.*Media' \
-                  '|third_party/WebKit/LayoutTests/media/' \
-                  '|third_party/WebKit/public/.*Media'
-    },
-    'blink_media_queries': {
-      'filepath': 'third_party/WebKit/Source/core/css/CSSMediaRule' \
-                    '|third_party/WebKit/Source/core/css/MediaList' \
-                    '|third_party/WebKit/Source/core/css/MediaQuery' \
-                    '|third_party/WebKit/Source/core/css/parser/MediaQuery'
-    },
-    'blink_navigator_content_utils': {
-      'filepath': 'third_party/WebKit/Source/modules/navigatorcontentutils' \
-                  '|third_party/WebKit/LayoutTests/fast/dom/navigatorcontentutils'
-    },
-    'blink_out_of_process_frames': {
-      'filepath': 'third_party/WebKit/Source/core/frame/FrameOwner' \
-                  '|third_party/WebKit/Source/core/frame/Frame\.' \
-                  '|third_party/WebKit/Source/web/WebFrame' \
-                  '|third_party/WebKit/Source/web/WebRemoteFrameImpl'
-    },
-    'blink_fileapi': {
-      'filepath': 'third_party/WebKit/Source/modules/filesystem/' \
-                  '|third_party/WebKit/Source/core/fileapi/' \
-                  '|third_party/WebKit/Source/platform/.*File' \
-                  '|third_party/WebKit/Source/web/.*File' \
-                  '|third_party/WebKit/LayoutTests/fast/file' \
-                  '|third_party/WebKit/public/.*File'
-    },
-    'blink_frames': {
-      'filepath': 'third_party/WebKit/Source/core/frame/'
-    },
-    'blink_quota': {
-      'filepath': 'third_party/WebKit/Source/modules/quota/' \
-                  '|third_party/WebKit/Source/web/.*Quota' \
-                  '|third_party/WebKit/public/.*Quota'
-    },
-    'blink_mediastream': {
-      'filepath': 'third_party/WebKit/Source/modules/mediastream/' \
-                  '|third_party/WebKit/Source/platform/mediastream/' \
-                  '|third_party/WebKit/Source/platform/exported/WebMediaStream' \
-                  '|third_party/WebKit/Source/platform/exported/WebRTC' \
-                  '|third_party/WebKit/LayoutTests/fast/mediastream/'
-    },
-    'blink_geolocation': {
-      'filepath': 'third_party/WebKit/LayoutTests/geolocation-api/' \
-                  '|third_party/WebKit/Source/modules/geolocation/' \
-                  '|third_party/WebKit/Source/web/.*Geolocation' \
-                  '|third_party/WebKit/public/web/.*Geolocation'
-    },
-    'blink_htmlparser': {
-      'filepath': 'third_party/WebKit/Source/core/html/parser/'
-    },
-    'blink_screen_orientation': {
-      'filepath': 'third_party/WebKit/Source/modules/screen_orientation/' \
-                  '|third_party/WebKit/public/platform/modules/screen_orientation',
-    },
-    'blink_script': {
-      'filepath': 'third_party/WebKit/Source/bindings/core/v8/.*Module.*' \
-                  '|third_party/WebKit/Source/bindings/core/v8/ScriptController.*' \
-                  '|third_party/WebKit/Source/bindings/core/v8/ScriptSourceCode.*' \
-                  '|third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.*'
-                  '|third_party/WebKit/Source/core/dom/.*Modul.*' \
-                  '|third_party/WebKit/Source/core/dom/.*Script.*' \
-                  '|third_party/WebKit/Source/core/html/HTMLScriptElement.*' \
-                  '|third_party/WebKit/Source/core/html/parser/HTMLParserScriptRunner.*' \
-                  '|third_party/WebKit/Source/core/loader/modulescript/' \
-                  '|third_party/WebKit/Source/core/loader/resource/ScriptResource.*' \
-                  '|third_party/WebKit/Source/core/svg/SVGScriptElement.*' \
-                  '|third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.*'
-    },
-    'blink_scheduler': {
-      'filepath': 'third_party/WebKit/Source/platform/scheduler' \
-                  '|third_party/WebKit/Source/core/html/parser/.*Scheduler'
-    },
-    'blink_serviceworkers' : {
-      'filepath': 'third_party/WebKit/Source/modules/serviceworkers' \
-                  '|third_party/WebKit/LayoutTests/http/tests/serviceworker' \
-                  '|third_party/WebKit/LayoutTests/external/wpt/service-workers'
-    },
-    'blink_serviceworkers_tests' : {
-      'filepath': 'third_party/WebKit/LayoutTests/http/tests/serviceworker' \
-                  '|third_party/WebKit/LayoutTests/external/wpt/service-workers'
-    },
-    'blink_spellcheck' : {
-      'filepath': 'third_party/WebKit/Source/core/editing/spellcheck'
-    },
-    'blink_shadow_dom': {
-      'filepath': 'third_party/WebKit/Source/core/dom/.*Shadow' \
-                  '|third_party/WebKit/Source/core/dom/.*Slot' \
-                  '|third_party/WebKit/Source/core/dom/.*InsertionPoint' \
-                  '|third_party/WebKit/Source/core/dom/.*FlatTree'
-    },
-    'blink_spv2_layout_tests': {
-      'filepath': 'third_party/WebKit/LayoutTests/virtual/spv2'
-    },
-    'blink_style': {
-      'filepath': 'third_party/WebKit/.*(style/|Style)',
-    },
-    'blink_svg': {
-      'filepath': 'third_party/WebKit/Source/core/(layout/)?svg',
-    },
-    'blink_vibration': {
-      'filepath': 'third_party/WebKit/LayoutTests/vibration/' \
-                  '|third_party/WebKit/Source/modules/vibration/'
-    },
-    'blink_viewport_interaction': {
-      'filepath': 'third_party/WebKit/Source/core/css/.*Viewport' \
-                  '|third_party/WebKit/Source/core/dom/ViewportArguments' \
-                  '|third_party/WebKit/Source/core/html/HTMLMetaElement' \
-                  '|third_party/WebKit/Source/core/page/FrameView' \
-                  '|third_party/WebKit/Source/core/page/scrolling'
-    },
-    'blink_w3ctests': {
-      'filepath': 'third_party/WebKit/LayoutTests/external/' \
-                  '|third_party/WebKit/Tools/Scripts/webkitpy/w3c/'
-    },
-    'blink_web': {
-      'filepath': 'third_party/WebKit/Source/web'
-    },
-    'blink_webcomponents': {
-      'filepath': 'third_party/WebKit/Source/core/dom/.*Shadow' \
-                  '|third_party/WebKit/Source/core/dom/.*Slot' \
-                  '|third_party/WebKit/Source/core/dom/.*InsertionPoint' \
-                  '|third_party/WebKit/Source/core/dom/.*FlatTree' \
-                  '|third_party/WebKit/Source/core/html/custom/' \
-                  '|third_party/WebKit/Source/core/html/imports/' \
-                  '|third_party/WebKit/Source/bindings/core/v8/.*CustomElement'
-    },
-    'blink_webp': {
-      'filepath': 'third_party/WebKit/Source/platform/image-decoders/webp' \
-                  '|third_party/WebKit/Source/platform/image-encoders/skia/WEBP'
-    },
-    'blink_websockets': {
-      'filepath': 'third_party/WebKit/Source/modules/websockets/'
-    },
-    'blink_workers': {
-      'filepath': 'third_party/WebKit/Source/core/workers' \
-                  '|third_party/WebKit/LayoutTests/http/tests/workers' \
-                  '|third_party/WebKit/LayoutTests/fast/workers' \
-                  '|third_party/WebKit/LayoutTests/external/wpt/workers'
-    },
-    'blink_wtf': {
-      'filepath': 'third_party/WebKit/Source/wtf',
-    },
-    'blink_xml': {
-      'filepath': 'third_party/WebKit/Source/core/xml/'
-    },
-    'blink_xmlhttprequest': {
-      'filepath': 'third_party/WebKit/Source/core/xmlhttprequest/'
-    },
-    'test_runner': {
-      'filepath': 'components/test_runner/' \
-                  '|content/shell/(common|browser|renderer)/layout_test/' \
-                  '|content/test/layouttest_support.cc' \
-                  '|content/public/test/layouttest_support.h' \
-    },
   },
 
   ##############################################################################
@@ -1643,20 +1610,17 @@
                       'je_julie.kim@chromium.org',
                       'nektar+watch@chromium.org',
                       'yuzo+watch@chromium.org'],
-    'add_to_homescreen': ['agrieve+watch@chromium.org',
-                          'dominickn+watch@chromium.org',
+    'add_to_homescreen': ['dominickn+watch@chromium.org',
                           'hanxi+watch@chromium.org',
-                          'pkotwicz+watch@chromium.org',
-                          'zpeng+watch@chromium.org'],
+                          'piotrs+watch@chromium.org',
+                          'pkotwicz+watch@chromium.org'],
     'android_crash_reporting': ['asvitkine+watch@chromium.org'],
-    'android_item_chooser_dialogs': ['juncai+watch@chromium.org',
-                                     'ortuno+watch@chromium.org'],
     'android_crazy_linker': ['johnmaguire+watch@google.com'],
     'android_infobars': ['dfalcantara+watch@chromium.org'],
     'android_infra': ['agrieve+watch@chromium.org',
-                      'jbudorick+watch@chromium.org',
-                      'mikecase+watch@chromium.org'],
-    'android_java': ['agrieve+watch@chromium.org'],
+                      'jbudorick+watch@chromium.org'],
+    'android_item_chooser_dialogs': ['juncai+watch@chromium.org',
+                                     'ortuno+watch@chromium.org'],
     'android_loading': ['gabadie+watch@chromium.org',
                         'lizeb+watch-android-loading@chromium.org'],
     'android_media': ['avayvod+watch@chromium.org',
@@ -1668,12 +1632,11 @@
     'android_uma_settings': ['asvitkine+watch@chromium.org',
                              'gayane+watch@chromium.org'],
     'android_webapk': ['dominickn+watch@chromium.org',
-                       'zpeng+watch@chromium.org'],
+                       'piotrs+watch@chromium.org'],
     'android_webview': ['android-webview-reviews@chromium.org'],
-    'app_list': ['mgiuca@chromium.org',
-                 'tfarina@chromium.org'],
-    'app_shortcuts': ['mgiuca@chromium.org',
-                      'tapted@chromium.org'],
+    'app_list': ['tfarina@chromium.org'],
+    'app_shortcuts': ['mgiuca+watch@chromium.org',
+                      'tapted+watch@chromium.org'],
     'appcache': ['michaeln@chromium.org'],
     'apps': ['chromium-apps-reviews@chromium.org',
              'tfarina@chromium.org'],
@@ -1683,6 +1646,7 @@
             'victorhsieh+watch@chromium.org',
             'yusukes+watch@chromium.org'],
     'arc_auth': ['khmel+watch@chromium.org'],
+    'arc_fileapi': ['nya+watch@chromium.org'],
     'arc_kiosk': ['poromov+watch@chromium.org'],
     'arc_net': ['abhishekbh@chromium.org',
                 'cernekee@chromium.org',
@@ -1697,23 +1661,22 @@
                         'kalyan.kondapally@intel.com',
                         'piman+watch@chromium.org'],
     'auto_bisect': ['auto-bisect-reviews@chromium.org'],
-    'autofill': ['estade+watch@chromium.org',
-                 'rouslan+autofill@chromium.org',
+    'autofill': ['rouslan+autofill@chromium.org',
                  'vabr+watchlistautofill@chromium.org',
                  'mathp+autofillwatch@chromium.org',
                  'sebsg+autofillwatch@chromium.org',
                  'rogerm+autofillwatch@chromium.org'],
-    'background_fetch': ['awdf+watch@chromium.org',
+    'background_fetch': ['delphick+watch@chromium.org',
                          'johnme+watch@chromium.org',
                          'peter@chromium.org'],
     'background_sync': ['chasej+watch@chromium.org',
                         'iclelland+watch@chromium.org',
-                        'jkarlin+watch@chromium.org',
                         'peter@chromium.org'],
     'banners': ['dominickn+watch@chromium.org',
                 'hanxi+watch@chromium.org',
-                'pkotwicz+watch@chromium.org',
-                'zpeng+watch@chromium.org'],
+                'piotrs+watch@chromium.org',
+                'pkotwicz+watch@chromium.org'],
+    'base': ['vmpstr+watch@chromium.org'],
     'base_allocator': ['dmikurube@chromium.org',
                        'wfh+watch@chromium.org'],
     'base_memory': ['gavinp+memory@chromium.org'],
@@ -1722,8 +1685,6 @@
                             'robliao+watch@chromium.org'],
     'base_win': ['grt+watch@chromium.org',
                  'wfh+watch@chromium.org'],
-    'base': ['vmpstr+watch@chromium.org',
-             'danakj+watch@chromium.org',],
     'battery_status': ['timvolodine@chromium.org'],
     'binary_size': ['agrieve+watch@chromium.org',
                     'estevenson+watch@chromium.org',
@@ -1753,6 +1714,7 @@
                        'junov@chromium.org'],
     'blink_client_hints': ['yoav@yoav.ws'],
     'blink_clipboard': ['dcheng@chromium.org'],
+    'blink_controller': ['haraken@chromium.org'],
     'blink_css': ['alexis.menard@intel.com',
                   'apavlov+blink@chromium.org',
                   'blink-reviews-css@chromium.org',
@@ -1777,8 +1739,7 @@
     'blink_dom': ['blink-reviews-dom@chromium.org',
                   'dglazkov+blink@chromium.org',
                   'eae+blinkwatch@chromium.org',
-                  'rob.buis@samsung.com',
-                  'sigbjornf@opera.com'],
+                  'rob.buis@samsung.com'],
     'blink_dom_events': ['hayato@chromium.org'],
     'blink_events': ['blink-reviews-events@chromium.org',
                      'dglazkov+blink@chromium.org',
@@ -1786,8 +1747,8 @@
                      'eae+blinkwatch@chromium.org'],
     'blink_fetch': ['gavinp+loader@chromium.org',
                     'japhet@chromium.org',
-                    'loading-reviews+fetch@chromium.org',
-                    'tyoshino+watch@chromium.org'],
+                    'loading-reviews+fetch@chromium.org'],
+    'blink_fetch_api': ['tyoshino+watch@chromium.org'],
     'blink_fileapi': ['kinuko+fileapi@chromium.org',
                       'nhiroki@chromium.org',
                       'tzik@chromium.org'],
@@ -1822,6 +1783,7 @@
                         'dgrogan+ng@chromium.org',
                         'atotic+reviews@chromium.org',
                         'lchoi+reviews@chromium.org'],
+    'blink_layout_ng_test_expectations': ['xiaochengh@chromium.org'],
     'blink_loader': ['gavinp+loader@chromium.org',
                      'japhet@chromium.org',
                      'loading-reviews@chromium.org',
@@ -1835,8 +1797,6 @@
     'blink_mediastream': ['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'],
@@ -1854,14 +1814,11 @@
                                 'pdr+graphicswatchlist@chromium.org',
                                 'rob.buis@samsung.com',
                                 'schenney@chromium.org'],
+    'blink_preloadScanner': ['yoav@yoav.ws'],
     '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'],
@@ -1885,6 +1842,7 @@
                           'timvolodine@chromium.org',
                           'xiaochengh@chromium.org'],
     'blink_spv2_layout_tests': ['pdr+virtualspv2watchlist@chromium.org'],
+    'blink_streams': ['tyoshino+watch@chromium.org'],
     'blink_style': ['blink-reviews-style@chromium.org'],
     'blink_svg': ['dschulze@chromium.org',
                   'fmalita+watch@chromium.org',
@@ -1898,6 +1856,7 @@
                     'fs@opera.com',
                     'glenn@chromium.org',
                     'silviapf@chromium.org'],
+    'blink_url_api': ['tyoshino+watch@chromium.org'],
     'blink_vibration': ['mlamouri+watch-blink@chromium.org'],
     'blink_viewport_interaction': ['kenneth.christiansen@gmail.com'],
     'blink_w3ctests': ['blink-reviews-w3ctests@chromium.org'],
@@ -1917,7 +1876,6 @@
     'blink_wtf': ['blink-reviews-wtf@chromium.org',
                   'mikhail.pozdnyakov@intel.com'],
     'blink_xml': ['dominicc+watchlist@chromium.org'],
-    'blink_xmlhttprequest': ['tyoshino+watch@chromium.org'],
     'bookmarks': ['tfarina@chromium.org'],
     'bottombar': ['donnd+watch@chromium.org',
                   'mdjones+watch@chromium.org'],
@@ -1925,16 +1883,15 @@
     'browser_components': ['browser-components-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': ['hcarmona+bubble@chromium.org',
                'groby+bubble@chromium.org',
                'rouslan+bubble@chromium.org'],
-    'cache_storage': ['jkarlin+watch@chromium.org',
-                      'nhiroki@chromium.org'],
-    'cast': ['avayvod+watch@chromium.org',
+    'cache_storage': ['nhiroki@chromium.org'],
+    'cast': ['amp+watch@chromium.org',
+             'avayvod+watch@chromium.org',
              'imcheng+watch@chromium.org',
              'isheriff+watch@chromium.org',
              'jasonroberts+watch@google.com',
@@ -1943,7 +1900,9 @@
     'cast_certificate': ['dougsteed+watch@chromium.org',
                          'mfoltz+watch@chromium.org',
                          'ryanchung+watch@chromium.org'],
-    'cast_channel': ['mfoltz+watch@chromium.org'],
+    'cast_channel': ['amp+watch@chromium.org',
+                     'mfoltz+watch@chromium.org',
+                     'ryanchung+watch@chromium.org'],
     'cc': ['cc-bugs@chromium.org'],
     'certificate_transparency': ['certificate-transparency-chrome@googlegroups.com',
                                  'eranm@chromium.org',
@@ -1998,27 +1957,34 @@
     'content_shell': ['jochen+watch@chromium.org',
                       'mlamouri+watch-content@chromium.org',
                       'peter@chromium.org'],
+    'content_websockets': ['tyoshino+watch@chromium.org'],
     'content_worker': ['blink-worker-reviews@chromium.org',
                        'kinuko+watch@chromium.org'],
     'contextual_search': ['donnd+watch@chromium.org',
                           'twellington+watch@chromium.org'],
     'courgette': ['huangs+watch@chromium.org',
                   'wfh+watch@chromium.org'],
+    'cq': ['cq-config-changes@chromium.org',
+           'shinyak+cc@chromium.org',
+           'tikuta+cc@chromium.org',
+           'ukai+cc@chromium.org',
+           'yyanagisawa+cc@chromium.org'],
     'cr_elements': ['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'],
+    'developer_recommended_flags': ['scheib+watch@chromium.org'],
     'device_bluetooth': ['ortuno+watch@chromium.org',
                          'scheib+watch@chromium.org'],
     'device_chooser': ['juncai+watch@chromium.org'],
     'device_sensors': ['mlamouri+watch-sensors@chromium.org',
                        'rijubrata.bhaumik@intel.com',
                        'timvolodine@chromium.org'],
-    'developer_recommended_flags': ['scheib+watch@chromium.org'],
     'devtools': ['devtools-reviews@chromium.org',
                  'pfeldman@chromium.org'],
-    'dial': ['mfoltz+watch@chromium.org',
+    'dial': ['amp+watch@chromium.org',
+             'mfoltz+watch@chromium.org',
              'zhaobin+watch@chromium.org'],
     'disk_cache': ['gavinp+disk@chromium.org'],
     'download': ['dtrainor+watch@chromium.org'],
@@ -2056,24 +2022,22 @@
     'gn': ['agrieve+watch@chromium.org',
            'dpranke@chromium.org',
            'tfarina@chromium.org'],
-    'goma': ['shinyak+cc@chromium.com',
-             'tikuta+cc@chromium.com',
-             'ukai+cc@chromium.com',
-             'yyanagisawa+cc@chromium.com'],
     'gpu': ['piman+watch@chromium.org'],
     'history_ui': ['pam+watch@chromium.org'],
     'hotword': ['rlp+watch@chromium.org'],
     'i18n': ['jshin+watch@chromium.org'],
     'importer': ['tfarina@chromium.org'],
+    'incident_reporting': ['grt+watch@chromium.org'],
     'indexed_db': ['cmumford@chromium.org',
                    'jsbell+idb@chromium.org'],
     'ink_drop': ['bruthig+ink_drop@chromium.org'],
     'input': ['dtapuska+chromiumwatch@chromium.org'],
-    'installable': ['dominickn+watch@chromium.org'],
-    'installer': ['grt+watch@chromium.org',
-                  'pennymac+watch@chromium.org',
-                  'wfh+watch@chromium.org'],
+    'installable': ['dominickn+watch@chromium.org',
+                    'piotrs+watch@chromium.org'],
     'installer_linux': [ 'mmoss@chromium.org'],
+    'installer_win': ['grt+watch@chromium.org',
+                      'pennymac+watch@chromium.org',
+                      'wfh+watch@chromium.org'],
     'instant': ['dcblack@chromium.org',
                 'donnd+watch@chromium.org',
                 'jered+watch@chromium.org',
@@ -2097,13 +2061,13 @@
                 'eugenebut@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'],
+    'libwebp': ['jzern@chromium.org',
+                'skal@google.com',
+                'urvang@chromium.org'],
     'libxml_xslt': ['ail@google.com',
                     'dominicc+watchlist@chromium.org'],
     'linux_fonts': ['derat+watch@chromium.org'],
@@ -2122,12 +2086,14 @@
     'media_mojo': ['alokp+watch@chromium.org'],
     'media_recorder': ['emircan+watch+mediarecorder@chromium.org',
                        'mcasas+mediarecorder@chromium.org'],
-    'media_remoting': ['apacible+watch@chromium.org',
+    'media_remoting': ['amp+watch@chromium.org',
+                       'apacible+watch@chromium.org',
                        'erickung+watch@chromium.org',
                        'mfoltz+watch@chromium.org',
                        'miu+watch@chromium.org',
                        'xjz+watch@chromium.org'],
-    'media_router': ['imcheng+watch@chromium.org',
+    'media_router': ['amp+watch@chromium.org',
+                     'imcheng+watch@chromium.org',
                      'mfoltz+watch@chromium.org'],
     'memory_coordinator': ['chrome-grc-reviews+memory@chromium.org'],
     'message_loop': ['sadrul@chromium.org'],
@@ -2154,6 +2120,7 @@
     'net_log': ['bnc+watch@chromium.org',
                 'eroman@chromium.org'],
     'net_spdy': ['bnc+watch@chromium.org'],
+    'net_websockets': ['tyoshino+watch@chromium.org'],
     'netinfo': ['jkarlin+watch@chromium.org'],
     'notifications': ['awdf+watch@chromium.org',
                       'mlamouri+watch-notifications@chromium.org',
@@ -2172,14 +2139,14 @@
                       'petewil+watch@chromium.org',
                       'romax+watch@chromium.org'],
     'omnibox': ['jdonnelly+watch@chromium.org'],
-    'options': ['michaelpg+watch-options@chromium.org'],
     'origin_trials': ['chasej+watch@chromium.org',
                       'iclelland+watch@chromium.org'],
     'ozone': ['kalyan.kondapally@intel.com',
               'ozone-reviews@chromium.org'],
     'page_info' : ['lgarron+watch@chromium.org',
                    'raymes+watch@chromium.org'],
-    'page_load_metrics' : ['csharrison+watch@chromium.org',
+    'page_load_metrics' : ['bmcquade+watch@chromium.org',
+                           'csharrison+watch@chromium.org',
                            'loading-reviews+metrics@chromium.org',
                            'speed-metrics-reviews@chromium.org'],
     'panels': ['dcheng@chromium.org',
@@ -2203,7 +2170,8 @@
     'permissions': ['dominickn+watch@chromium.org',
                     'hanxi+watch@chromium.org',
                     'mlamouri+watch-permissions@chromium.org',
-                    'raymes+watch@chromium.org'],
+                    'raymes+watch@chromium.org',
+                    'timloh+watch@chromium.org'],
     'plugin': ['jam@chromium.org'],
     'polymer': ['michaelpg+watch-polymer@chromium.org'],
     'precache': ['wifiprefetch-reviews@google.com'],
@@ -2211,16 +2179,17 @@
     'prerender': ['cbentzel+watch@chromium.org',
                   'gavinp+prer@chromium.org',
                   'tburkard+watch@chromium.org'],
-    'presentation': ['mfoltz+watch@chromium.org'],
-    'push_messaging': ['johnme+watch@chromium.org',
+    'presentation': ['amp+watch@chromium.org',
+                     'mfoltz+watch@chromium.org'],
+    'push_messaging': ['awdf+watch@chromium.org',
+                       'johnme+watch@chromium.org',
                        'peter@chromium.org'],
     'reading_list': ['stkhapugin@chromium.org'],
     'remoting': ['chromoting-reviews@chromium.org'],
     'rlz_id': ['alito+watch@chromium.org',
                'gab+watch@chromium.org',
                'robertshield+watch@chromium.org'],
-    'safe_browsing': ['grt+watch@chromium.org',
-                      'timvolodine@chromium.org',
+    'safe_browsing': ['timvolodine@chromium.org',
                       'vakh+watch@chromium.org'],
     'safe_browsing_db': ['timvolodine@chromium.org',
                          'vakh+watch@chromium.org'],
@@ -2259,7 +2228,8 @@
                'nhiroki@chromium.org',
                'tzik@chromium.org'],
     'tab_alert_indicators': ['miu+watch@chromium.org'],
-    'tab_capture': ['miu+watch@chromium.org',
+    'tab_capture': ['amp+watch@chromium.org',
+                    'miu+watch@chromium.org',
                     'xjz+watch@chromium.org'],
     'tab_contents': ['ajwong+watch@chromium.org',
                      'avi@chromium.org',
@@ -2301,10 +2271,10 @@
     'views': ['tfarina@chromium.org'],
     'virtual_keyboard': ['blakeo+virtualkb@chromium.org',
                          'dfaden+virtualkb@google.com',
-                         'groby+virtualkb@chromium.org',
                          'oka+watchvk@chromium.org',
                          'yhanada+watchvk@chromium.org'],
     'virtual_reality': ['feature-vr-reviews@chromium.org'],
+    'web_share': ['mgiuca+watch@chromium.org'],
     'webrtc_browser_tests': ['phoglund+watch@chromium.org'],
     'website_settings': ['markusheintz@chromium.org',
                          'msramek+watch@chromium.org',