The Great Blink mv for source files, part 1.

Update file contents without moving files.

NOAUTOREVERT=true
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
TBR=darin@chromium.org

Bug: 768828
Change-Id: I8a2f4535a49a25f44b43df32f25691c0a2556d28
Reviewed-on: https://chromium-review.googlesource.com/1001152
Commit-Queue: Blink Reformat <blink-reformat@chromium.org>
Reviewed-by: Blink Reformat <blink-reformat@chromium.org>
Reviewed-by: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549060}

.gn

@@ -37,16 +37,16 @@ default_args = {
   v8_extra_library_files = [
     # Dependencies used by the extra libraries. Putting them here causes them
     # to be executed first during snapshot creation.
-    "//third_party/WebKit/Source/core/streams/CommonOperations.js",
-    "//third_party/WebKit/Source/core/streams/CommonStrings.js",
-    "//third_party/WebKit/Source/core/streams/SimpleQueue.js",
+    "//third_party/blink/renderer/core/streams/CommonOperations.js",
+    "//third_party/blink/renderer/core/streams/CommonStrings.js",
+    "//third_party/blink/renderer/core/streams/SimpleQueue.js",
 
     # Extra libraries.
-    "//third_party/WebKit/Source/core/streams/ByteLengthQueuingStrategy.js",
-    "//third_party/WebKit/Source/core/streams/CountQueuingStrategy.js",
-    "//third_party/WebKit/Source/core/streams/ReadableStream.js",
-    "//third_party/WebKit/Source/core/streams/WritableStream.js",
-    "//third_party/WebKit/Source/core/streams/TransformStream.js",
+    "//third_party/blink/renderer/core/streams/ByteLengthQueuingStrategy.js",
+    "//third_party/blink/renderer/core/streams/CountQueuingStrategy.js",
+    "//third_party/blink/renderer/core/streams/ReadableStream.js",
+    "//third_party/blink/renderer/core/streams/WritableStream.js",
+    "//third_party/blink/renderer/core/streams/TransformStream.js",
   ]
   v8_experimental_extra_library_files = []
   v8_enable_gdbjit = false

BUILD.gn

@@ -169,8 +169,8 @@ group("gn_all") {
       "//mojo:mojo_unittests",
       "//mojo/common:mojo_common_unittests",
       "//net:net_perftests",
-      "//third_party/WebKit/Source/controller:webkit_unit_tests",
-      "//third_party/WebKit/Source/platform/wtf:wtf_unittests",
+      "//third_party/blink/renderer/controller:webkit_unit_tests",
+      "//third_party/blink/renderer/platform/wtf:wtf_unittests",
       "//ui/gl:gl_unittests",
       "//url/ipc:url_ipc_unittests",
     ]
@@ -203,11 +203,11 @@ group("gn_all") {
       "//media/capture:capture_unittests",
       "//media/cast:cast_unittests",
       "//storage:storage_unittests",
-      "//third_party/WebKit/Source/platform:blink_platform_unittests",
-      "//third_party/WebKit/Source/platform/heap:blink_heap_unittests",
       "//third_party/angle/src/tests:angle_end2end_tests",
       "//third_party/angle/src/tests:angle_unittests",
       "//third_party/angle/src/tests:angle_white_box_tests",
+      "//third_party/blink/renderer/platform:blink_platform_unittests",
+      "//third_party/blink/renderer/platform/heap:blink_heap_unittests",
       "//third_party/catapult/telemetry:bitmaptools($host_toolchain)",
       "//third_party/smhasher:pmurhash",
       "//tools/imagediff($host_toolchain)",
@@ -856,7 +856,7 @@ if (!is_ios) {
 
     deps = [
       ":webkit_layout_tests",
-      "//third_party/WebKit/public:all_blink",
+      "//third_party/blink/public:all_blink",
     ]
   }
 
@@ -902,8 +902,8 @@ if (!is_ios) {
       "//services/shape_detection/public/mojom:mojom_js_data_deps",
       "//services/device/public/mojom:mojom_js_data_deps",
       "//services/device/public/mojom:generic_sensor_js_data_deps",
-      "//third_party/WebKit/public:blink_devtools_frontend_resources_files",
-      "//third_party/WebKit/public:mojo_bindings_js_data_deps",
+      "//third_party/blink/public:blink_devtools_frontend_resources_files",
+      "//third_party/blink/public:mojo_bindings_js_data_deps",
       "//third_party/mesa:osmesa",
       "//tools/imagediff",
     ]
@@ -997,7 +997,7 @@ if (!is_ios) {
       "//third_party/WebKit/LayoutTests/SlowTests",
       "//third_party/WebKit/LayoutTests/TestExpectations",
       "//third_party/WebKit/LayoutTests/VirtualTestSuites",
-      "//third_party/WebKit/Source/bindings/scripts/",
+      "//third_party/blink/renderer/bindings/scripts/",
       "//third_party/WebKit/Tools/Scripts/",
       "//third_party/blink/tools/",
       "//third_party/catapult/common/py_utils/",

WATCHLISTS

@@ -174,8 +174,8 @@
                   'chrome/android/javatests/src/org/chromium/chrome/browser/banners/|'\
                   'chrome/browser/banners/|'\
                   'chrome/browser/ui/android/infobars/app_banner_.*|'\
-                  'third_party/WebKit/public/platform/modules/app_banner/|'\
-                  'third_party/WebKit/Source/modules/app_banner/',
+                  'third_party/blink/public/platform/modules/app_banner/|'\
+                  'third_party/blink/renderer/modules/app_banner/',
     },
     'base': {
       'filepath': '^base/',
@@ -214,64 +214,64 @@
       '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',
+      'filepath': 'third_party/blink/renderer/modules/app_banner' \
+                  '|third_party/blink/public/platform/modules/app_banner',
     },
     'blink_audio': {
-      'filepath': 'third_party/WebKit/Source/platform/audio' \
-                  '|third_party/WebKit/Source/modules/webaudio' \
+      'filepath': 'third_party/blink/renderer/platform/audio' \
+                  '|third_party/blink/renderer/modules/webaudio' \
                   '|third_party/WebKit/LayoutTests/external/wpt/webaudio',
     },
     'blink_battery_status': {
-      'filepath': 'third_party/WebKit/Source/modules/battery/' \
+      'filepath': 'third_party/blink/renderer/modules/battery/' \
                   '|third_party/WebKit/LayoutTests/battery-status/' \
-                  '|third_party/WebKit/Source/core/frame/PlatformEvent(Controller|Dispatcher)'
+                  '|third_party/blink/renderer/core/frame/PlatformEvent(Controller|Dispatcher)'
     },
     'blink_bindings': {
-      'filepath': 'third_party/WebKit/Source/platform/bindings' \
-                  '|third_party/WebKit/Source/bindings',
+      'filepath': 'third_party/blink/renderer/platform/bindings' \
+                  '|third_party/blink/renderer/bindings',
     },
     'blink_bindings_serialization': {
-      'filepath': 'third_party/WebKit/Source/bindings/(core|modules)/v8/.*[Ss]erializ',
+      'filepath': 'third_party/blink/renderer/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',
+      'filepath': 'third_party/blink/renderer/core/html/canvas' \
+                  '|third_party/blink/renderer/core/html/HTMLCanvasElement' \
+                  '|third_party/blink/renderer/modules/canvas2d' \
+                  '|third_party/blink/renderer/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/loader/resource/ImageResource*' \
-                  '|third_party/WebKit/Source/platform/loader/fetch/FetchContext*' \
-                  '|third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher*'
+      'filepath': 'third_party/blink/renderer/core/loader/AcceptClientHints*' \
+                  '|third_party/blink/renderer/core/loader/FrameFetchContext*' \
+                  '|third_party/blink/renderer/core/loader/resource/ImageResource*' \
+                  '|third_party/blink/renderer/platform/loader/fetch/FetchContext*' \
+                  '|third_party/blink/renderer/platform/loader/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',
+      'filepath': 'third_party/blink/renderer/core/clipboard' \
+                  '|third_party/blink/renderer/core/page/.*Drag' \
+                  '|third_party/blink/renderer/platform/.*Drag' \
+                  '|third_party/blink/renderer/platform/clipboard' \
+                  '|third_party/blink/renderer/web/.*Drag' \
+                  '|third_party/blink/public/platform/.*Drag' \
+                  '|third_party/blink/public/web/.*Drag',
     },
     'blink_common': {
       'filepath': 'third_party/WebKit/common'
-                  '|third_party/WebKit/public/common' \
-                  '|third_party/WebKit/public/mojom',
+                  '|third_party/blink/public/common' \
+                  '|third_party/blink/public/mojom',
     },
     'blink_controller': {
-      'filepath': 'third_party/WebKit/Source/controller',
+      'filepath': 'third_party/blink/renderer/controller',
     },
     'blink_css': {
-      'filepath': 'third_party/WebKit/Source/core/css',
+      'filepath': 'third_party/blink/renderer/core/css',
     },
     'blink_css_flexbox': {
-      'filepath': 'third_party/WebKit/Source/core/rendering/.*Flex' \
+      'filepath': 'third_party/blink/renderer/core/rendering/.*Flex' \
                   '|third_party/WebKit/LayoutTests/fast/deprecated-flexbox/' \
                   '|third_party/WebKit/LayoutTests/css3/flexbox/' \
                   '|third_party/WebKit/LayoutTests/ietestcenter/css3/flexbox/'
@@ -283,202 +283,202 @@
                   '|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' \
+      'filepath': 'third_party/blink/renderer/core/layout/.*Grid' \
+                  '|third_party/blink/renderer/core/paint/.*Grid' \
+                  '|third_party/blink/renderer/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_custom_elements': {
-      'filepath': 'third_party/WebKit/Source/core/html/custom/' \
-                  '|third_party/WebKit/Source/bindings/core/v8/.*CustomElement',
+      'filepath': 'third_party/blink/renderer/core/html/custom/' \
+                  '|third_party/blink/renderer/bindings/core/v8/.*CustomElement',
     },
     'blink_device_orientation': {
-      'filepath': 'third_party/WebKit/Source/modules/device_orientation/' \
+      'filepath': 'third_party/blink/renderer/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'
+                  '|third_party/blink/renderer/core/frame/PlatformEvent(Controller|Dispatcher)' \
+                  '|third_party/blink/renderer/core/frame/DeviceSingleWindowEventController'
     },
     'blink_devtools': {
       'filepath': 'third_party/WebKit/.*(inspector|DevTools|devtools)',
     },
     'blink_dom': {
-      'filepath': 'third_party/WebKit/Source/core/dom/'
+      'filepath': 'third_party/blink/renderer/core/dom/'
     },
     'blink_dom_events': {
-      'filepath': 'third_party/WebKit/Source/core/dom/events/'
+      'filepath': 'third_party/blink/renderer/core/dom/events/'
     },
     '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'
+      'filepath': 'third_party/blink/renderer/core/page/.*Event' \
+                  '|third_party/blink/renderer/core/dom/.*Event' \
+                  '|third_party/blink/renderer/core/css/.*Event' \
+                  '|third_party/blink/renderer/platform/.*Event'
     },
     'blink_fetch': {
-      'filepath': 'third_party/WebKit/Source/platform/loader/fetch'
+      'filepath': 'third_party/blink/renderer/platform/loader/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' \
+      'filepath': 'third_party/blink/renderer/modules/filesystem/' \
+                  '|third_party/blink/renderer/core/fileapi/' \
+                  '|third_party/blink/renderer/platform/.*File' \
+                  '|third_party/blink/renderer/web/.*File' \
                   '|third_party/WebKit/LayoutTests/fast/file' \
-                  '|third_party/WebKit/public/.*File'
+                  '|third_party/blink/public/.*File'
     },
     'blink_frames': {
-      'filepath': 'third_party/WebKit/Source/core/frame/'
+      'filepath': 'third_party/blink/renderer/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'
+                  '|third_party/blink/renderer/modules/geolocation/' \
+                  '|third_party/blink/renderer/web/.*Geolocation' \
+                  '|third_party/blink/public/web/.*Geolocation'
     },
     'blink_heap': {
-      'filepath': 'third_party/WebKit/Source/platform/heap' \
+      'filepath': 'third_party/blink/renderer/platform/heap' \
                   '|base/allocator/partition_allocator/'
     },
     'blink_html': {
-      'filepath': 'third_party/WebKit/Source/core/html/'
+      'filepath': 'third_party/blink/renderer/core/html/'
     },
     'blink_htmlparser': {
-      'filepath': 'third_party/WebKit/Source/core/html/parser/'
+      'filepath': 'third_party/blink/renderer/core/html/parser/'
     },
     'blink_indexed_db': {
-      'filepath': 'third_party/WebKit/Source/modules/indexeddb/' \
-                  '|third_party/WebKit/Source/web/.*IDB' \
+      'filepath': 'third_party/blink/renderer/modules/indexeddb/' \
+                  '|third_party/blink/renderer/web/.*IDB' \
                   '|third_party/WebKit/LayoutTests/storage/indexeddb' \
-                  '|third_party/WebKit/public/platform/.*IDB'
+                  '|third_party/blink/public/platform/.*IDB'
     },
     'blink_input': {
-      'filepath': 'third_party/WebKit/Source/core/input/'
+      'filepath': 'third_party/blink/renderer/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'
+      'filepath': 'third_party/blink/renderer/core/page/scrolling/ScrollingCoordinator' \
+                  '|third_party/blink/renderer/platform/graphics/GraphicsLayer' \
+                  '|third_party/blink/renderer/core/layout/Layer'
     },
     'blink_layout': {
-      'filepath': 'third_party/WebKit/Source/core/layout' \
-                  '|third_party/WebKit/Source/core/rendering'
+      'filepath': 'third_party/blink/renderer/core/layout' \
+                  '|third_party/blink/renderer/core/rendering'
     },
     'blink_layout_ng': {
-      'filepath': 'third_party/WebKit/Source/core/layout/ng',
+      'filepath': 'third_party/blink/renderer/core/layout/ng',
     },
     'blink_loader': {
-      'filepath': 'third_party/WebKit/Source/core/loader/' \
-                  '|third_party/WebKit/Source/platform/loader/'
+      'filepath': 'third_party/blink/renderer/core/loader/' \
+                  '|third_party/blink/renderer/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' \
+      'filepath': 'third_party/blink/renderer/core/css/mediaControls' \
+                  '|third_party/blink/renderer/core/html/.*(Audio|Media|Video)' \
+                  '|third_party/blink/renderer/core/html/shadow/MediaControl' \
+                  '|third_party/blink/renderer/core/layout/LayoutMedia' \
+                  '|third_party/blink/renderer/core/layout/LayoutTextTrackContainerElement' \
+                  '|third_party/blink/renderer/modules/(encryptedmedia|mediasource)' \
+                  '|third_party/blink/renderer/platform/drm/' \
+                  '|third_party/blink/renderer/platform/graphics/media/' \
+                  '|third_party/blink/renderer/web/.*Media' \
                   '|third_party/WebKit/LayoutTests/media/' \
-                  '|third_party/WebKit/public/.*Media'
+                  '|third_party/blink/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'
+      'filepath': 'third_party/blink/renderer/core/css/CSSMediaRule' \
+                    '|third_party/blink/renderer/core/css/MediaList' \
+                    '|third_party/blink/renderer/core/css/MediaQuery' \
+                    '|third_party/blink/renderer/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' \
+      'filepath': 'third_party/blink/renderer/modules/mediastream/' \
+                  '|third_party/blink/renderer/platform/mediastream/' \
+                  '|third_party/blink/renderer/platform/exported/WebMediaStream' \
+                  '|third_party/blink/renderer/platform/exported/WebRTC' \
                   '|third_party/WebKit/LayoutTests/fast/mediastream/'
     },
     'blink_modules': {
-      'filepath': 'third_party/WebKit/Source/modules'
+      'filepath': 'third_party/blink/renderer/modules'
     },
     'blink_navigator_content_utils': {
-      'filepath': 'third_party/WebKit/Source/modules/navigatorcontentutils' \
+      'filepath': 'third_party/blink/renderer/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'
+      'filepath': 'third_party/blink/renderer/core/frame/FrameOwner' \
+                  '|third_party/blink/renderer/core/frame/Frame\.' \
+                  '|third_party/blink/renderer/web/WebFrame' \
+                  '|third_party/blink/renderer/web/WebRemoteFrameImpl'
     },
     'blink_paint': {
-      'filepath': 'third_party/WebKit/Source/core/paint/'
+      'filepath': 'third_party/blink/renderer/core/paint/'
     },
     'blink_paintworklet': {
-      'filepath': 'third_party/WebKit/Source/modules/csspaint/' \
+      'filepath': 'third_party/blink/renderer/modules/csspaint/' \
                   '|third_party/WebKit/LayoutTests/http/tests/csspaint/' \
                   '|third_party/WebKit/LayoutTests/externla/wpt/css/css-paint-api/'
     },
     'blink_performance_timing': {
-      'filepath': 'third_party/WebKit/Source/core/timing/'
+      'filepath': 'third_party/blink/renderer/core/timing/'
     },
     'blink_permissions': {
-      'filepath': 'third_party/WebKit/Source/modules/permissions/' \
-                  '|third_party/WebKit/public/platform/modules/permissions/',
+      'filepath': 'third_party/blink/renderer/modules/permissions/' \
+                  '|third_party/blink/public/platform/modules/permissions/',
     },
     'blink_platform': {
-      'filepath': 'third_party/WebKit/Source/platform'
+      'filepath': 'third_party/blink/renderer/platform'
     },
     'blink_platform_graphics': {
-      'filepath': 'third_party/WebKit/Source/platform/fonts' \
-                  '|third_party/WebKit/Source/platform/geometry' \
-                  '|third_party/WebKit/Source/platform/graphics'
+      'filepath': 'third_party/blink/renderer/platform/fonts' \
+                  '|third_party/blink/renderer/platform/geometry' \
+                  '|third_party/blink/renderer/platform/graphics'
     },
     'blink_preloadScanner': {
-      'filepath': 'third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner',
+      'filepath': 'third_party/blink/renderer/core/html/parser/HTMLPreloadScanner',
     },
     'blink_prerender': {
       'filepath': 'third_party/WebKit/.*(Prerender|loader/LinkLoader|html/HTMLLinkElement)'
     },
     'blink_public_api': {
-      'filepath': 'third_party/WebKit/public'
+      'filepath': 'third_party/blink/public'
     },
     'blink_quota': {
-      'filepath': 'third_party/WebKit/Source/modules/quota/' \
-                  '|third_party/WebKit/Source/web/.*Quota' \
-                  '|third_party/WebKit/public/.*Quota'
+      'filepath': 'third_party/blink/renderer/modules/quota/' \
+                  '|third_party/blink/renderer/web/.*Quota' \
+                  '|third_party/blink/public/.*Quota'
     },
     'blink_scheduler': {
-      'filepath': 'third_party/WebKit/Source/platform/scheduler' \
-                  '|third_party/WebKit/Source/core/html/parser/.*Scheduler'
+      'filepath': 'third_party/blink/renderer/platform/scheduler' \
+                  '|third_party/blink/renderer/core/html/parser/.*Scheduler'
     },
     'blink_screen_orientation': {
-      'filepath': 'third_party/WebKit/Source/modules/screen_orientation/' \
-                  '|third_party/WebKit/public/platform/modules/screen_orientation',
+      'filepath': 'third_party/blink/renderer/modules/screen_orientation/' \
+                  '|third_party/blink/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.*'
+      'filepath': 'third_party/blink/renderer/bindings/core/v8/.*Module.*' \
+                  '|third_party/blink/renderer/bindings/core/v8/ScriptController.*' \
+                  '|third_party/blink/renderer/bindings/core/v8/ScriptSourceCode.*' \
+                  '|third_party/blink/renderer/bindings/core/v8/V8ScriptRunner.*'
+                  '|third_party/blink/renderer/core/dom/.*Modul.*' \
+                  '|third_party/blink/renderer/core/dom/.*Script.*' \
+                  '|third_party/blink/renderer/core/html/HTMLScriptElement.*' \
+                  '|third_party/blink/renderer/core/html/parser/HTMLParserScriptRunner.*' \
+                  '|third_party/blink/renderer/core/loader/modulescript/' \
+                  '|third_party/blink/renderer/core/loader/resource/ScriptResource.*' \
+                  '|third_party/blink/renderer/core/svg/SVGScriptElement.*' \
+                  '|third_party/blink/renderer/core/xml/parser/XMLDocumentParser.*'
     },
     'blink_scroll': {
-      'filepath': 'third_party/WebKit/Source/core/frame/.*View.*' \
-                  '|third_party/WebKit/Source/core/input/.*Scroll.*' \
-                  '|third_party/WebKit/Source/core/input/EventHandler.*' \
-                  '|third_party/WebKit/Source/core/page/scrolling/' \
-                  '|third_party/WebKit/Source/core/paint/.*ScrollableArea.*' \
-                  '|third_party/WebKit/Source/platform/scroll/'
+      'filepath': 'third_party/blink/renderer/core/frame/.*View.*' \
+                  '|third_party/blink/renderer/core/input/.*Scroll.*' \
+                  '|third_party/blink/renderer/core/input/EventHandler.*' \
+                  '|third_party/blink/renderer/core/page/scrolling/' \
+                  '|third_party/blink/renderer/core/paint/.*ScrollableArea.*' \
+                  '|third_party/blink/renderer/platform/scroll/'
     },
     'blink_serviceworkers' : {
-      'filepath': 'third_party/WebKit/Source/modules/serviceworkers' \
+      'filepath': 'third_party/blink/renderer/modules/serviceworkers' \
                   '|third_party/WebKit/LayoutTests/http/tests/serviceworker' \
                   '|third_party/WebKit/LayoutTests/external/wpt/service-workers'
     },
@@ -487,13 +487,13 @@
                   '|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'
+      'filepath': 'third_party/blink/renderer/core/dom/.*Shadow' \
+                  '|third_party/blink/renderer/core/dom/.*Slot' \
+                  '|third_party/blink/renderer/core/dom/.*InsertionPoint' \
+                  '|third_party/blink/renderer/core/dom/.*FlatTree'
     },
     'blink_spellcheck' : {
-      'filepath': 'third_party/WebKit/Source/core/editing/spellcheck'
+      'filepath': 'third_party/blink/renderer/core/editing/spellcheck'
     },
     'blink_spv2_layout_tests': {
       'filepath': 'third_party/WebKit/LayoutTests/virtual/spv2'
@@ -502,51 +502,51 @@
       'filepath': 'third_party/WebKit/.*(style/|Style)',
     },
     'blink_svg': {
-      'filepath': 'third_party/WebKit/Source/core/(layout/)?svg',
+      'filepath': 'third_party/blink/renderer/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' \
+      'filepath': 'third_party/blink/renderer/core/html/track/' \
+                  '|third_party/blink/renderer/core/loader/TextTrack' \
+                  '|third_party/blink/renderer/core/html/HTMLMediaElement' \
+                  '|third_party/blink/renderer/core/html/HTMLTrackElement' \
+                  '|third_party/blink/renderer/core/html/shadow/MediaControl' \
+                  '|third_party/blink/renderer/core/css/mediaControl' \
                   '|third_party/WebKit/LayoutTests/media/track/'
     },
     'blink_vibration': {
       'filepath': 'third_party/WebKit/LayoutTests/vibration/' \
-                  '|third_party/WebKit/Source/modules/vibration/'
+                  '|third_party/blink/renderer/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/frame/FrameView.*' \
-                  '|third_party/WebKit/Source/core/frame/.*Viewport.*' \
-                  '|third_party/WebKit/Source/core/html/HTMLMetaElement'
+      'filepath': 'third_party/blink/renderer/core/css/.*Viewport' \
+                  '|third_party/blink/renderer/core/dom/ViewportArguments' \
+                  '|third_party/blink/renderer/core/frame/FrameView.*' \
+                  '|third_party/blink/renderer/core/frame/.*Viewport.*' \
+                  '|third_party/blink/renderer/core/html/HTMLMetaElement'
     },
     'blink_w3ctests': {
       'filepath': 'third_party/WebKit/LayoutTests/external/' \
                   '|third_party/WebKit/Tools/Scripts/webkitpy/w3c/'
     },
     'blink_webp': {
-      'filepath': 'third_party/WebKit/Source/platform/image-decoders/webp' \
-                  '|third_party/WebKit/Source/platform/image-encoders/skia/WEBP'
+      'filepath': 'third_party/blink/renderer/platform/image-decoders/webp' \
+                  '|third_party/blink/renderer/platform/image-encoders/skia/WEBP'
     },
     'blink_websockets': {
-      'filepath': 'third_party/WebKit/Source/modules/websockets/' \
-                  '|third_party/WebKit/Source/platform/modules/websockets/'
+      'filepath': 'third_party/blink/renderer/modules/websockets/' \
+                  '|third_party/blink/renderer/platform/modules/websockets/'
     },
     'blink_workers': {
-      'filepath': 'third_party/WebKit/Source/core/workers' \
+      'filepath': 'third_party/blink/renderer/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/platform/wtf',
+      'filepath': 'third_party/blink/renderer/platform/wtf',
     },
     'blink_xml': {
-      'filepath': 'third_party/WebKit/Source/core/xml/'
+      'filepath': 'third_party/blink/renderer/core/xml/'
     },
     'bookmarks': {
       'filepath': 'chrome/browser/bookmarks/' \
@@ -668,7 +668,7 @@
       'filepath': 'chrome/test/chromedriver|'\
                   'chrome/test/data/chromedriver|'\
                   'third_party/webdriver|'\
-                  'third_party/WebKit/Source/devtools/front_end/emulated_devices/module.json'
+                  'third_party/blink/renderer/devtools/front_end/emulated_devices/module.json'
     },
     'chromeos': {
       'filepath': 'chromeos/',
@@ -849,8 +849,8 @@
       'filepath': 'extension',
     },
     'feature_policy': {
-      'filepath': 'third_party/WebKit/Source/platform/feature_policy/|' \
-                  'third_party/WebKit/Source/bindings/core/v8/OriginTrialFeatures',
+      'filepath': 'third_party/blink/renderer/platform/feature_policy/|' \
+                  'third_party/blink/renderer/bindings/core/v8/OriginTrialFeatures',
     },
     'fileapi': {
       'filepath': 'file_system/|' \
@@ -894,7 +894,7 @@
     },
     'generic_sensor': {
       'filepath': 'services/device/generic_sensor/|'\
-                  'third_party/WebKit/Source/modules/sensor/',
+                  'third_party/blink/renderer/modules/sensor/',
     },
     'geolocation': {
       'filepath': 'chrome/browser/geolocation/|'\
@@ -1035,13 +1035,13 @@
     },
     'media_capture_from_element': {
       'filepath': 'content/renderer/media_capture_from_element/' \
-                  '|third_party/WebKit/Source/modules/mediacapture/' \
-                  '|third_party/WebKit/Source/platform/exported/WebCanvasCapture' \
+                  '|third_party/blink/renderer/modules/mediacapture/' \
+                  '|third_party/blink/renderer/platform/exported/WebCanvasCapture' \
                   '|third_party/WebKit/LayoutTests/fast/mediacapturefromelement/' \
-                  '|third_party/WebKit/public/platform/WebCanvasCapture'
+                  '|third_party/blink/public/platform/WebCanvasCapture'
     },
     'media_controls': {
-      'filepath': 'third_party/WebKit/Source/modules/media_controls/'
+      'filepath': 'third_party/blink/renderer/modules/media_controls/'
     },
     'media_galleries': {
       'filepath': 'chrome/browser/extensions/api/media_galleries/'\
@@ -1055,10 +1055,10 @@
     },
     'media_recorder': {
       'filepath': 'content/renderer/media_recorder/' \
-                  '|third_party/WebKit/Source/modules/mediarecorder/' \
-                  '|third_party/WebKit/Source/platform/exported/WebMediaRecorder' \
+                  '|third_party/blink/renderer/modules/mediarecorder/' \
+                  '|third_party/blink/renderer/platform/exported/WebMediaRecorder' \
                   '|third_party/WebKit/LayoutTests/fast/mediarecorder/' \
-                  '|third_party/WebKit/public/platform/WebMediaRecorder'
+                  '|third_party/blink/public/platform/WebMediaRecorder'
     },
     'media_remoting': {
       'filepath': 'chrome/browser/media/cast_remoting'\
@@ -1176,8 +1176,8 @@
         'notification_helper/|'\
         '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|'\
+        'third_party/blink/renderer/modules/notifications|'\
+        'third_party/blink/public/platform/modules/notifications|'\
         'ui/message_center/'
     },
     'nqe': {
@@ -1282,8 +1282,8 @@
                   '|third_party/WebKit/LayoutTests/external/wpt/payment-request'\
                   '|third_party/WebKit/LayoutTests/http/tests/payments'\
                   '|third_party/WebKit/LayoutTests/payments'\
-                  '|third_party/WebKit/public/platform/modules/payments'\
-                  '|third_party/WebKit/Source/modules/payments'
+                  '|third_party/blink/public/platform/modules/payments'\
+                  '|third_party/blink/renderer/modules/payments'
     },
     'payments_ios': {
       'filepath': 'ios/web/payments'\
@@ -1304,7 +1304,7 @@
                   '|permission_context',
     },
     'picture_in_picture': {
-      'filepath': 'third_party/WebKit/Source/modules/picture_in_picture/'
+      'filepath': 'third_party/blink/renderer/modules/picture_in_picture/'
     },
     'plugin': {
       'filepath': 'chrome/browser/plugin|chrome/plugin/|'\
@@ -1330,9 +1330,9 @@
     },
     'presentation': {
       'filepath': 'content/(browser|common|renderer)/presentation/' \
-                  '|third_party/WebKit/public/platform/modules/presentation/' \
+                  '|third_party/blink/public/platform/modules/presentation/' \
                   '|third_party/WebKit/LayoutTests/presentation/' \
-                  '|third_party/WebKit/Source/modules/presentation/'
+                  '|third_party/blink/renderer/modules/presentation/'
     },
     'push_messaging': {
       'filepath': 'push_messaging'
@@ -1352,7 +1352,7 @@
                   'rlz/win/lib/machine_id_win.cc',
     },
     'runtime_enabled_features': {
-      'filepath' : 'third_party/WebKit/Source/platform/runtime_enabled_features.json5'
+      'filepath' : 'third_party/blink/renderer/platform/runtime_enabled_features.json5'
     },
     'safe_browsing': {
       'filepath': 'chrome/(browser|common|renderer)/safe_browsing/|'\
@@ -1609,8 +1609,8 @@
                   '|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/',
+                  '|third_party/blink/public/platform/modules/webshare/'\
+                  '|third_party/blink/renderer/modules/webshare/',
     },
     'webrtc_browser_tests': {
       'filepath': 'chrome/browser/media/.*webrtc.*browsertest|'\

android_webview/BUILD.gn

@@ -134,9 +134,9 @@ android_assets("locale_pak_assets") {
 
 repack("repack_pack") {
   sources = [
-    "$root_gen_dir/blink/public/resources/blink_resources.pak",
     "$root_gen_dir/content/content_resources.pak",
     "$root_gen_dir/net/net_resources.pak",
+    "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
     "$target_gen_dir/aw_resources.pak",
     "$target_gen_dir/components_resources.pak",
     "$target_gen_dir/webui_resources.pak",
@@ -147,7 +147,7 @@ repack("repack_pack") {
     ":generate_webui_resources",
     "//content:resources",
     "//net:net_resources",
-    "//third_party/WebKit/public:resources",
+    "//third_party/blink/public:resources",
   ]
   output = "$target_gen_dir/resources.pak"
 
@@ -159,13 +159,13 @@ repack("repack_pack") {
 
 repack("repack_100_percent") {
   sources = [
-    "$root_gen_dir/blink/public/resources/blink_scaled_resources_100_percent.pak",
     "$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
+    "$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_100_percent.pak",
     "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
   ]
   deps = [
     "//content/app/resources",
-    "//third_party/WebKit/public:scaled_resources_100_percent",
+    "//third_party/blink/public:scaled_resources_100_percent",
     "//ui/resources",
   ]
   output = "$target_gen_dir/chrome_100_percent.pak"
@@ -767,7 +767,7 @@ source_set("common") {
     "//skia",
     "//storage/browser",
     "//storage/common",
-    "//third_party/WebKit/public:blink",
+    "//third_party/blink/public:blink",
     "//ui/base",
     "//ui/events:gesture_detection",
     "//ui/gfx",
@@ -896,8 +896,8 @@ android_library("android_webview_java") {
     "//device/gamepad:java",
     "//device/geolocation:geolocation_java",
     "//net/android:net_java",
-    "//third_party/WebKit/public:blink_headers_java",
     "//third_party/android_tools:android_support_annotations_java",
+    "//third_party/blink/public:blink_headers_java",
     "//ui/android:ui_java",
   ]
 

android_webview/browser/DEPS

@@ -70,9 +70,9 @@ include_rules = [
 
 
   # QuotaStatusCode required by AwQuotaManagerBridge.
-  "+third_party/WebKit/public/mojom/quota",
+  "+third_party/blink/public/mojom/quota",
   # POD structure required by the find-in-page IPC messages.
-  "+third_party/WebKit/public/web/WebFindOptions.h",
+  "+third_party/blink/public/web/web_find_options.h",
   # Interface required for in-process input event handling.
-  "+third_party/WebKit/public/web/WebCompositorInputHandler.h"
+  "+third_party/blink/public/web/WebCompositorInputHandler.h"
 ]

android_webview/browser/aw_quota_manager_bridge.cc

@@ -16,7 +16,7 @@
 #include "content/public/common/content_client.h"
 #include "jni/AwQuotaManagerBridge_jni.h"
 #include "storage/browser/quota/quota_manager.h"
-#include "third_party/WebKit/public/mojom/quota/quota_types.mojom.h"
+#include "third_party/blink/public/mojom/quota/quota_types.mojom.h"
 #include "url/gurl.h"
 
 using base::android::AttachCurrentThread;

android_webview/browser/find_helper.cc

@@ -8,7 +8,7 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/stop_find_action.h"
-#include "third_party/WebKit/public/web/WebFindOptions.h"
+#include "third_party/blink/public/web/web_find_options.h"
 
 using content::WebContents;
 using blink::WebFindOptions;

android_webview/renderer/DEPS

@@ -25,8 +25,8 @@ include_rules = [
   "+services/network/public/cpp",
   "+services/service_manager/public/cpp",
 
-  "+third_party/WebKit/public/platform",
-  "+third_party/WebKit/public/web",
+  "+third_party/blink/public/platform",
+  "+third_party/blink/public/web",
 
   "+ui/gfx",
   "+ui/gl/gpu_memory_buffer.h",

android_webview/renderer/aw_content_renderer_client.cc

@@ -46,13 +46,13 @@
 #include "services/network/public/cpp/features.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
-#include "third_party/WebKit/public/platform/WebString.h"
-#include "third_party/WebKit/public/platform/WebURL.h"
-#include "third_party/WebKit/public/platform/WebURLError.h"
-#include "third_party/WebKit/public/platform/WebURLRequest.h"
-#include "third_party/WebKit/public/web/WebFrame.h"
-#include "third_party/WebKit/public/web/WebNavigationType.h"
-#include "third_party/WebKit/public/web/WebSecurityPolicy.h"
+#include "third_party/blink/public/platform/web_string.h"
+#include "third_party/blink/public/platform/web_url.h"
+#include "third_party/blink/public/platform/web_url_error.h"
+#include "third_party/blink/public/platform/web_url_request.h"
+#include "third_party/blink/public/web/web_frame.h"
+#include "third_party/blink/public/web/web_navigation_type.h"
+#include "third_party/blink/public/web/web_security_policy.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "url/gurl.h"

android_webview/renderer/aw_content_settings_client.cc

@@ -5,8 +5,8 @@
 #include "android_webview/renderer/aw_content_settings_client.h"
 
 #include "content/public/renderer/render_frame.h"
-#include "third_party/WebKit/public/platform/WebURL.h"
-#include "third_party/WebKit/public/web/WebLocalFrame.h"
+#include "third_party/blink/public/platform/web_url.h"
+#include "third_party/blink/public/web/web_local_frame.h"
 #include "url/gurl.h"
 
 namespace android_webview {

android_webview/renderer/aw_content_settings_client.h

@@ -7,7 +7,7 @@
 
 #include "base/macros.h"
 #include "content/public/renderer/render_frame_observer.h"
-#include "third_party/WebKit/public/platform/WebContentSettingsClient.h"
+#include "third_party/blink/public/platform/web_content_settings_client.h"
 
 namespace android_webview {
 

android_webview/renderer/aw_print_render_frame_helper_delegate.cc

@@ -4,7 +4,7 @@
 
 #include "android_webview/renderer/aw_print_render_frame_helper_delegate.h"
 
-#include "third_party/WebKit/public/web/WebElement.h"
+#include "third_party/blink/public/web/web_element.h"
 
 namespace android_webview {
 

android_webview/renderer/aw_render_frame_ext.cc

@@ -14,18 +14,18 @@
 #include "content/public/renderer/document_state.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
-#include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
-#include "third_party/WebKit/public/platform/WebSize.h"
-#include "third_party/WebKit/public/web/WebDocument.h"
-#include "third_party/WebKit/public/web/WebElement.h"
-#include "third_party/WebKit/public/web/WebElementCollection.h"
-#include "third_party/WebKit/public/web/WebFrameWidget.h"
-#include "third_party/WebKit/public/web/WebHitTestResult.h"
-#include "third_party/WebKit/public/web/WebImageCache.h"
-#include "third_party/WebKit/public/web/WebLocalFrame.h"
-#include "third_party/WebKit/public/web/WebMeaningfulLayout.h"
-#include "third_party/WebKit/public/web/WebNode.h"
-#include "third_party/WebKit/public/web/WebView.h"
+#include "third_party/blink/public/platform/web_security_origin.h"
+#include "third_party/blink/public/platform/web_size.h"
+#include "third_party/blink/public/web/web_document.h"
+#include "third_party/blink/public/web/web_element.h"
+#include "third_party/blink/public/web/web_element_collection.h"
+#include "third_party/blink/public/web/web_frame_widget.h"
+#include "third_party/blink/public/web/web_hit_test_result.h"
+#include "third_party/blink/public/web/web_image_cache.h"
+#include "third_party/blink/public/web/web_local_frame.h"
+#include "third_party/blink/public/web/web_meaningful_layout.h"
+#include "third_party/blink/public/web/web_node.h"
+#include "third_party/blink/public/web/web_view.h"
 #include "url/url_canon.h"
 #include "url/url_constants.h"
 #include "url/url_util.h"

android_webview/renderer/aw_render_thread_observer.cc

@@ -6,8 +6,8 @@
 
 #include "android_webview/common/render_view_messages.h"
 #include "ipc/ipc_message_macros.h"
-#include "third_party/WebKit/public/platform/WebCache.h"
-#include "third_party/WebKit/public/platform/WebNetworkStateNotifier.h"
+#include "third_party/blink/public/platform/web_cache.h"
+#include "third_party/blink/public/platform/web_network_state_notifier.h"
 
 namespace android_webview {
 

android_webview/renderer/aw_render_view_ext.cc

@@ -6,8 +6,8 @@
 #include "android_webview/common/render_view_messages.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
-#include "third_party/WebKit/public/web/WebLocalFrame.h"
-#include "third_party/WebKit/public/web/WebView.h"
+#include "third_party/blink/public/web/web_local_frame.h"
+#include "third_party/blink/public/web/web_view.h"
 
 namespace android_webview {
 

android_webview/renderer/print_render_frame_observer.cc

@@ -7,7 +7,7 @@
 #include "components/printing/common/print_messages.h"
 #include "components/printing/renderer/print_render_frame_helper.h"
 #include "content/public/renderer/render_frame.h"
-#include "third_party/WebKit/public/web/WebLocalFrame.h"
+#include "third_party/blink/public/web/web_local_frame.h"
 
 namespace android_webview {
 

ash/BUILD.gn

@@ -1197,7 +1197,7 @@ component("ash") {
 
     # TODO(msw): Remove this; only ash_with_content should depend on webkit.
     "//ash/app_list/presenter",
-    "//third_party/WebKit/public:blink_headers",
+    "//third_party/blink/public:blink_headers",
     "//third_party/icu",
     "//third_party/qcms",
     "//third_party/re2",
@@ -1992,7 +1992,7 @@ static_library("test_support_common") {
   public_deps = [
     "//ash",
     "//testing/gtest",
-    "//third_party/WebKit/public:blink_headers",
+    "//third_party/blink/public:blink_headers",
     "//ui/display:display_manager_test_api",
   ]
   deps = [

ash/content/display/DEPS

@@ -2,7 +2,7 @@ specific_include_rules = {
   "screen_orientation_controller_chromeos_unittest.cc": [
     "+content/public/browser/browser_context.h",
     "+content/public/browser/web_contents.h",
-    "+third_party/WebKit/public/platform/modules/screen_orientation/WebScreenOrientationLockType.h",    
+    "+third_party/blink/public/platform/modules/screen_orientation/web_screen_orientation_lock_type.h",    
   ],
   ".*test\.cc": [
     "+content/public/test/test_browser_context.h"

ash/content/display/screen_orientation_controller_chromeos_unittest.cc

@@ -27,7 +27,7 @@
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_context.h"
-#include "third_party/WebKit/public/platform/modules/screen_orientation/WebScreenOrientationLockType.h"
+#include "third_party/blink/public/platform/modules/screen_orientation/web_screen_orientation_lock_type.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/display/display.h"

ash/resources/BUILD.gn

@@ -62,8 +62,10 @@ template("ash_test_resources") {
 
     if (percent == "100") {
       # TODO(msw): This seems bad, but follows repack_ui_test_pak's example.
-      deps += [ "//third_party/WebKit/public:resources_grit" ]
-      sources += [ "$root_gen_dir/blink/public/resources/blink_resources.pak" ]
+      deps += [ "//third_party/blink/public:resources_grit" ]
+      sources += [
+        "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
+      ]
     }
   }
 }

build/check_gn_headers_whitelist.txt

@@ -242,30 +242,30 @@ skia/ext/convolver_mips_dspr2.h
 skia/ext/skia_commit_hash.h
 skia/ext/texture_handle.h
 testing/gmock_mutant.h
-third_party/WebKit/Source/bindings/modules/v8/serialization/WebCryptoSubTags.h
-third_party/WebKit/Source/core/animation/CSSInterpolationEnvironment.h
-third_party/WebKit/Source/core/animation/SVGInterpolationEnvironment.h
-third_party/WebKit/Source/core/css/resolver/StyleBuilder.h
-third_party/WebKit/Source/core/css/threaded/MultiThreadedTestUtil.h
-third_party/WebKit/Source/core/css/zoomAdjustedPixelValue.h
-third_party/WebKit/Source/core/dom/ArrayBufferViewHelpers.h
-third_party/WebKit/Source/core/editing/finder/FindOptions.h
-third_party/WebKit/Source/core/paint/FindPaintOffsetAndVisualRectNeedingUpdate.h
-third_party/WebKit/Source/core/style/ShapeValue.h
-third_party/WebKit/Source/core/style/TransformOrigin.h
-third_party/WebKit/Source/platform/EncryptedMediaRequest.h
-third_party/WebKit/Source/platform/fonts/FontSelector.h
-third_party/WebKit/Source/platform/fonts/Glyph.h
-third_party/WebKit/Source/platform/graphics/cpu/arm/WebGLImageConversionNEON.h
-third_party/WebKit/Source/platform/graphics/cpu/mips/WebGLImageConversionMSA.h
-third_party/WebKit/Source/platform/graphics/paint/PaintImage.h
-third_party/WebKit/Source/platform/scheduler/base/task_queue.h
-third_party/WebKit/Source/platform/text/TabSize.h
-third_party/WebKit/Source/platform/text/TextDirection.h
-third_party/WebKit/Source/platform/transforms/TransformOperation.h
-third_party/WebKit/public/platform/WebSourceLocation.h
-third_party/WebKit/public/platform/WebTouchInfo.h
-third_party/WebKit/public/platform/modules/media_capabilities/WebMediaCapabilitiesInfo.h
+third_party/blink/renderer/bindings/modules/v8/serialization/WebCryptoSubTags.h
+third_party/blink/renderer/core/animation/CSSInterpolationEnvironment.h
+third_party/blink/renderer/core/animation/SVGInterpolationEnvironment.h
+third_party/blink/renderer/core/css/resolver/StyleBuilder.h
+third_party/blink/renderer/core/css/threaded/MultiThreadedTestUtil.h
+third_party/blink/renderer/core/css/zoomAdjustedPixelValue.h
+third_party/blink/renderer/core/dom/ArrayBufferViewHelpers.h
+third_party/blink/renderer/core/editing/finder/FindOptions.h
+third_party/blink/renderer/core/paint/FindPaintOffsetAndVisualRectNeedingUpdate.h
+third_party/blink/renderer/core/style/ShapeValue.h
+third_party/blink/renderer/core/style/TransformOrigin.h
+third_party/blink/renderer/platform/EncryptedMediaRequest.h
+third_party/blink/renderer/platform/fonts/FontSelector.h
+third_party/blink/renderer/platform/fonts/Glyph.h
+third_party/blink/renderer/platform/graphics/cpu/arm/WebGLImageConversionNEON.h
+third_party/blink/renderer/platform/graphics/cpu/mips/WebGLImageConversionMSA.h
+third_party/blink/renderer/platform/graphics/paint/PaintImage.h
+third_party/blink/renderer/platform/scheduler/base/task_queue.h
+third_party/blink/renderer/platform/text/TabSize.h
+third_party/blink/renderer/platform/text/TextDirection.h
+third_party/blink/renderer/platform/transforms/TransformOperation.h
+third_party/blink/public/platform/WebSourceLocation.h
+third_party/blink/public/platform/WebTouchInfo.h
+third_party/blink/public/platform/modules/media_capabilities/WebMediaCapabilitiesInfo.h
 third_party/cacheinvalidation/src/google/cacheinvalidation/impl/build_constants.h
 third_party/expat/files/lib/ascii.h
 third_party/expat/files/lib/asciitab.h

cc/blink/BUILD.gn

@@ -41,7 +41,7 @@ cc_component("blink") {
     "//cc",
     "//cc/paint",
     "//gpu",
-    "//third_party/WebKit/public:blink",
+    "//third_party/blink/public:blink",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
@@ -68,7 +68,7 @@ cc_test("cc_blink_unittests") {
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
-    "//third_party/WebKit/public:blink",
+    "//third_party/blink/public:blink",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
   ]

cc/blink/DEPS

@@ -1,3 +1,3 @@
 include_rules = [
-  "+third_party/WebKit/public/platform"
+  "+third_party/blink/public/platform"
 ]

cc/blink/scrollbar_impl.cc

@@ -5,8 +5,8 @@
 #include "cc/blink/scrollbar_impl.h"
 
 #include "base/logging.h"
-#include "third_party/WebKit/public/platform/WebScrollbar.h"
-#include "third_party/WebKit/public/platform/WebScrollbarThemeGeometry.h"
+#include "third_party/blink/public/platform/web_scrollbar.h"
+#include "third_party/blink/public/platform/web_scrollbar_theme_geometry.h"
 
 using blink::WebScrollbar;
 

cc/blink/scrollbar_impl.h

@@ -10,7 +10,7 @@
 #include "base/macros.h"
 #include "cc/input/scrollbar.h"
 #include "cc/paint/paint_canvas.h"
-#include "third_party/WebKit/public/platform/WebScrollbarThemePainter.h"
+#include "third_party/blink/public/platform/web_scrollbar_theme_painter.h"
 
 namespace blink {
 class WebScrollbar;

cc/blink/web_blend_mode.h

@@ -5,7 +5,7 @@
 #ifndef CC_BLINK_WEB_BLEND_MODE_H_
 #define CC_BLINK_WEB_BLEND_MODE_H_
 
-#include "third_party/WebKit/public/platform/WebBlendMode.h"
+#include "third_party/blink/public/platform/web_blend_mode.h"
 #include "third_party/skia/include/core/SkBlendMode.h"
 
 namespace cc_blink {

cc/blink/web_compositor_support_impl.h

@@ -8,9 +8,9 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "cc/blink/cc_blink_export.h"
-#include "third_party/WebKit/public/platform/WebCompositorSupport.h"
-#include "third_party/WebKit/public/platform/WebContentLayerClient.h"
-#include "third_party/WebKit/public/platform/WebLayer.h"
+#include "third_party/blink/public/platform/web_compositor_support.h"
+#include "third_party/blink/public/platform/web_content_layer_client.h"
+#include "third_party/blink/public/platform/web_layer.h"
 
 namespace cc_blink {
 

cc/blink/web_content_layer_impl.cc

@@ -11,11 +11,11 @@
 #include "cc/base/switches.h"
 #include "cc/blink/web_display_item_list_impl.h"
 #include "cc/layers/picture_layer.h"
-#include "third_party/WebKit/public/platform/WebContentLayerClient.h"
-#include "third_party/WebKit/public/platform/WebFloatPoint.h"
-#include "third_party/WebKit/public/platform/WebFloatRect.h"
-#include "third_party/WebKit/public/platform/WebRect.h"
-#include "third_party/WebKit/public/platform/WebSize.h"
+#include "third_party/blink/public/platform/web_content_layer_client.h"
+#include "third_party/blink/public/platform/web_float_point.h"
+#include "third_party/blink/public/platform/web_float_rect.h"
+#include "third_party/blink/public/platform/web_rect.h"
+#include "third_party/blink/public/platform/web_size.h"
 #include "third_party/skia/include/core/SkMatrix44.h"
 
 using cc::PictureLayer;

cc/blink/web_content_layer_impl.h

@@ -13,7 +13,7 @@
 #include "cc/blink/cc_blink_export.h"
 #include "cc/blink/web_layer_impl.h"
 #include "cc/layers/content_layer_client.h"
-#include "third_party/WebKit/public/platform/WebContentLayer.h"
+#include "third_party/blink/public/platform/web_content_layer.h"
 
 namespace blink {
 class WebContentLayerClient;

cc/blink/web_display_item_list_impl.cc

@@ -12,8 +12,8 @@
 #include "cc/paint/paint_filter.h"
 #include "cc/paint/paint_op_buffer.h"
 #include "cc/paint/render_surface_filters.h"
-#include "third_party/WebKit/public/platform/WebFloatRect.h"
-#include "third_party/WebKit/public/platform/WebRect.h"
+#include "third_party/blink/public/platform/web_float_rect.h"
+#include "third_party/blink/public/platform/web_rect.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkMatrix44.h"
 #include "ui/gfx/geometry/rect_conversions.h"

cc/blink/web_display_item_list_impl.h

@@ -9,8 +9,8 @@
 #include "base/memory/ref_counted.h"
 #include "cc/blink/cc_blink_export.h"
 #include "cc/paint/display_item_list.h"
-#include "third_party/WebKit/public/platform/WebDisplayItemList.h"
-#include "third_party/WebKit/public/platform/WebVector.h"
+#include "third_party/blink/public/platform/web_display_item_list.h"
+#include "third_party/blink/public/platform/web_vector.h"
 #include "third_party/skia/include/core/SkBlendMode.h"
 #include "ui/gfx/geometry/point_f.h"
 

cc/blink/web_display_item_list_impl_unittest.cc

@@ -7,7 +7,7 @@
 #include "cc/paint/display_item_list.h"
 #include "cc/paint/paint_op_buffer.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/platform/WebFloatPoint.h"
+#include "third_party/blink/public/platform/web_float_point.h"
 
 namespace cc_blink {
 namespace {

cc/blink/web_external_texture_layer_impl.h

@@ -9,7 +9,7 @@
 
 #include "base/macros.h"
 #include "cc/blink/cc_blink_export.h"
-#include "third_party/WebKit/public/platform/WebExternalTextureLayer.h"
+#include "third_party/blink/public/platform/web_external_texture_layer.h"
 
 namespace cc {
 class TextureLayerClient;

cc/blink/web_image_layer_impl.h

@@ -10,7 +10,7 @@
 #include "base/macros.h"
 #include "cc/blink/cc_blink_export.h"
 #include "cc/paint/paint_image.h"
-#include "third_party/WebKit/public/platform/WebImageLayer.h"
+#include "third_party/blink/public/platform/web_image_layer.h"
 
 namespace cc_blink {
 

cc/blink/web_layer_impl.cc

@@ -24,12 +24,12 @@
 #include "cc/layers/touch_action_region.h"
 #include "cc/trees/element_id.h"
 #include "cc/trees/layer_tree_host.h"
-#include "third_party/WebKit/public/platform/WebFloatPoint.h"
-#include "third_party/WebKit/public/platform/WebFloatRect.h"
-#include "third_party/WebKit/public/platform/WebLayerPositionConstraint.h"
-#include "third_party/WebKit/public/platform/WebLayerScrollClient.h"
-#include "third_party/WebKit/public/platform/WebLayerStickyPositionConstraint.h"
-#include "third_party/WebKit/public/platform/WebSize.h"
+#include "third_party/blink/public/platform/web_float_point.h"
+#include "third_party/blink/public/platform/web_float_rect.h"
+#include "third_party/blink/public/platform/web_layer_position_constraint.h"
+#include "third_party/blink/public/platform/web_layer_scroll_client.h"
+#include "third_party/blink/public/platform/web_layer_sticky_position_constraint.h"
+#include "third_party/blink/public/platform/web_size.h"
 #include "third_party/skia/include/core/SkMatrix44.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/vector2d_conversions.h"

cc/blink/web_layer_impl.h

@@ -16,16 +16,16 @@
 #include "base/memory/ref_counted.h"
 #include "cc/blink/cc_blink_export.h"
 #include "cc/layers/layer_client.h"
-#include "third_party/WebKit/public/platform/WebColor.h"
-#include "third_party/WebKit/public/platform/WebDoublePoint.h"
-#include "third_party/WebKit/public/platform/WebFloatPoint.h"
-#include "third_party/WebKit/public/platform/WebFloatSize.h"
-#include "third_party/WebKit/public/platform/WebLayer.h"
-#include "third_party/WebKit/public/platform/WebPoint.h"
-#include "third_party/WebKit/public/platform/WebRect.h"
-#include "third_party/WebKit/public/platform/WebSize.h"
-#include "third_party/WebKit/public/platform/WebString.h"
-#include "third_party/WebKit/public/platform/WebVector.h"
+#include "third_party/blink/public/platform/web_color.h"
+#include "third_party/blink/public/platform/web_double_point.h"
+#include "third_party/blink/public/platform/web_float_point.h"
+#include "third_party/blink/public/platform/web_float_size.h"
+#include "third_party/blink/public/platform/web_layer.h"
+#include "third_party/blink/public/platform/web_point.h"
+#include "third_party/blink/public/platform/web_rect.h"
+#include "third_party/blink/public/platform/web_size.h"
+#include "third_party/blink/public/platform/web_string.h"
+#include "third_party/blink/public/platform/web_vector.h"
 #include "third_party/skia/include/core/SkMatrix44.h"
 
 namespace cc {

cc/blink/web_layer_impl_fixed_bounds.cc

@@ -5,8 +5,8 @@
 #include "cc/blink/web_layer_impl_fixed_bounds.h"
 
 #include "cc/layers/layer.h"
-#include "third_party/WebKit/public/platform/WebFloatPoint.h"
-#include "third_party/WebKit/public/platform/WebSize.h"
+#include "third_party/blink/public/platform/web_float_point.h"
+#include "third_party/blink/public/platform/web_size.h"
 #include "third_party/skia/include/core/SkMatrix44.h"
 
 using cc::Layer;

cc/blink/web_layer_impl_fixed_bounds_unittest.cc

@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "cc/blink/web_layer_impl_fixed_bounds.h"
 #include <vector>
 #include "cc/animation/animation_host.h"
-#include "cc/blink/web_layer_impl_fixed_bounds.h"
 #include "cc/layers/picture_image_layer.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/platform/WebFloatPoint.h"
-#include "third_party/WebKit/public/platform/WebSize.h"
+#include "third_party/blink/public/platform/web_float_point.h"
+#include "third_party/blink/public/platform/web_size.h"
 #include "third_party/skia/include/core/SkMatrix44.h"
 #include "ui/gfx/geometry/point3_f.h"
 

cc/blink/web_scrollbar_layer_impl.h

@@ -9,8 +9,8 @@
 
 #include "base/macros.h"
 #include "cc/blink/cc_blink_export.h"
-#include "third_party/WebKit/public/platform/WebScrollbar.h"
-#include "third_party/WebKit/public/platform/WebScrollbarLayer.h"
+#include "third_party/blink/public/platform/web_scrollbar.h"
+#include "third_party/blink/public/platform/web_scrollbar_layer.h"
 
 namespace blink {
 class WebScrollbarThemeGeometry;

chrome/BUILD.gn

@@ -20,7 +20,7 @@ import("//components/nacl/features.gni")
 import("//extensions/buildflags/buildflags.gni")
 import("//media/media_options.gni")
 import("//ppapi/buildflags/buildflags.gni")
-import("//third_party/WebKit/public/public_features.gni")
+import("//third_party/blink/public/public_features.gni")
 import("//third_party/widevine/cdm/widevine.gni")
 import("//tools/resources/generate_resource_whitelist.gni")
 import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
@@ -444,7 +444,7 @@ if (is_win) {
       deps += [ "//content/public/app:browser" ]
       assert_no_deps = [
         # The browser DLL may not depend on blink or v8.
-        "//third_party/WebKit/public:blink",
+        "//third_party/blink/public:blink",
         "//gin",
         "//v8",
       ]
@@ -935,7 +935,7 @@ if (is_win) {
         # Depend on :chrome_app to ensure that the bundle is produced before
         # creating or destroying the symlink.
         ":chrome_app",
-        "//third_party/WebKit/public:blink_devtools_frontend_resources",
+        "//third_party/blink/public:blink_devtools_frontend_resources",
       ]
     }
   } else {
@@ -1473,7 +1473,7 @@ group("browser_dependencies") {
       # is OK because all of content is linked into one library. Note that the
       # blink_headers target is OK, so we can't do a wildcard for all blink
       # targets.
-      "//third_party/WebKit/public:blink",
+      "//third_party/blink/public:blink",
     ]
 
     if (is_win) {
@@ -1498,7 +1498,7 @@ group("child_dependencies") {
     "//components/sync",
     "//content/public/child",
     "//pdf",
-    "//third_party/WebKit/public:blink_devtools_frontend_resources",
+    "//third_party/blink/public:blink_devtools_frontend_resources",
   ]
 
   if (enable_nacl) {

chrome/DEPS

@@ -35,9 +35,9 @@ include_rules = [
   "-tools",
 
   # Allow inclusion of WebKit API files.
-  "+third_party/WebKit/public/platform",
-  "+third_party/WebKit/public/public_buildflags.h",
-  "+third_party/WebKit/public/web",
+  "+third_party/blink/public/platform",
+  "+third_party/blink/public/public_buildflags.h",
+  "+third_party/blink/public/web",
 
   # Allow inclusion of third-party code:
   "+third_party/hunspell",

chrome/android/BUILD.gn

@@ -255,8 +255,6 @@ android_library("chrome_java") {
     "//services/shape_detection:shape_detection_java",
     "//services/shape_detection/public/mojom:mojom_java",
     "//skia/public/interfaces:interfaces_java",
-    "//third_party/WebKit/public:android_mojo_bindings_java",
-    "//third_party/WebKit/public:blink_headers_java",
     "//third_party/android_data_chart:android_data_chart_java",
     "//third_party/android_media:android_media_java",
     "//third_party/android_protobuf:protobuf_nano_javalib",
@@ -272,6 +270,8 @@ android_library("chrome_java") {
     "//third_party/android_tools:android_support_v7_gridlayout_java",
     "//third_party/android_tools:android_support_v7_mediarouter_java",
     "//third_party/android_tools:android_support_v7_recyclerview_java",
+    "//third_party/blink/public:android_mojo_bindings_java",
+    "//third_party/blink/public:blink_headers_java",
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
     "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
     "//third_party/custom_tabs_client:custom_tabs_support_java",
@@ -468,14 +468,14 @@ junit_binary("chrome_junit_tests") {
     "//mojo/public/java:bindings_java",
     "//mojo/public/java:system_java",
     "//net/android:net_java",
-    "//third_party/WebKit/public:android_mojo_bindings_java",
-    "//third_party/WebKit/public:blink_headers_java",
     "//third_party/android_protobuf:protobuf_nano_javalib",
     "//third_party/android_tools:android_arch_lifecycle_common_java",
     "//third_party/android_tools:android_support_annotations_java",
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//third_party/android_tools:android_support_v7_mediarouter_java",
     "//third_party/android_tools:android_support_v7_recyclerview_java",
+    "//third_party/blink/public:android_mojo_bindings_java",
+    "//third_party/blink/public:blink_headers_java",
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
     "//third_party/custom_tabs_client:custom_tabs_support_java",
     "//third_party/hamcrest:hamcrest_java",
@@ -572,8 +572,6 @@ android_library("chrome_test_java") {
     "//printing:printing_java",
     "//services:service_javatests",
     "//services/service_manager/public/java:service_manager_java",
-    "//third_party/WebKit/public:android_mojo_bindings_java",
-    "//third_party/WebKit/public:blink_headers_java",
     "//third_party/android_protobuf:protobuf_nano_javalib",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
@@ -582,6 +580,8 @@ android_library("chrome_test_java") {
     "//third_party/android_tools:android_support_design_java",
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//third_party/android_tools:android_support_v7_recyclerview_java",
+    "//third_party/blink/public:android_mojo_bindings_java",
+    "//third_party/blink/public:blink_headers_java",
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
     "//third_party/custom_tabs_client:custom_tabs_support_java",
     "//third_party/espresso:espresso_all_java",

chrome/browser/BUILD.gn

@@ -1805,10 +1805,10 @@ jumbo_split_static_library("browser") {
     "//sql",
     "//storage/browser",
     "//storage/common",
-    "//third_party/WebKit/public:buildflags",
-    "//third_party/WebKit/public:resources",
-    "//third_party/WebKit/public:scaled_resources",
-    "//third_party/WebKit/public/common",
+    "//third_party/blink/public:buildflags",
+    "//third_party/blink/public:resources",
+    "//third_party/blink/public:scaled_resources",
+    "//third_party/blink/public/common",
     "//third_party/cacheinvalidation",
     "//third_party/icu",
     "//third_party/leveldatabase",
@@ -4902,7 +4902,7 @@ static_library("test_support_ui") {
     "//components/translate/content/common",
     "//skia",
     "//testing/gtest",
-    "//third_party/WebKit/public:blink_headers",
+    "//third_party/blink/public:blink_headers",
   ]
 
   public_deps = [

chrome/browser/DEPS

@@ -137,49 +137,49 @@ include_rules = [
   # No inclusion of WebKit from the browser, other than the ones in
   # WebKit/public/{mojom,common}, or the ones that are strictly enum/POD,
   # header-only types, and some selected common code.
-  "-third_party/WebKit",
-  "+third_party/WebKit/public/common",
-  "+third_party/WebKit/public/mojom",
-  "+third_party/WebKit/public/platform/WebCache.h",
-  "+third_party/WebKit/public/platform/WebDisplayMode.h",
-  "+third_party/WebKit/public/platform/WebLoadingBehaviorFlag.h",
-  "+third_party/WebKit/public/platform/WebGestureEvent.h",
-  "+third_party/WebKit/public/platform/WebInputEvent.h",
-  "+third_party/WebKit/public/platform/WebMouseEvent.h",
-  "+third_party/WebKit/public/platform/WebMouseWheelEvent.h",
-  "+third_party/WebKit/public/platform/WebReferrerPolicy.h",
-  "+third_party/WebKit/public/platform/WebSecurityStyle.h",
-  "+third_party/WebKit/public/platform/WebSuddenTerminationDisablerType.h",
-  "+third_party/WebKit/public/platform/modules/notifications/WebNotificationConstants.h",
-  "+third_party/WebKit/public/platform/modules/remoteplayback/WebRemotePlaybackAvailability.h",
-  "+third_party/WebKit/public/platform/modules/screen_orientation/WebScreenOrientationLockType.h",
-  "+third_party/WebKit/public/public_buildflags.h",
-  "+third_party/WebKit/public/web/WebContextMenuData.h",
-  "+third_party/WebKit/public/web/WebFindOptions.h",
-  "+third_party/WebKit/public/web/WebMediaPlayerAction.h",
-  "+third_party/WebKit/public/web/WebPluginAction.h",
-  "+third_party/WebKit/public/web/WebPresentationReceiverFlags.h",
-  "+third_party/WebKit/public/web/WebTextDirection.h",
-  "+third_party/WebKit/public/web/WebTriggeringEventInfo.h",
+  "-third_party/blink",
+  "+third_party/blink/public/common",
+  "+third_party/blink/public/mojom",
+  "+third_party/blink/public/platform/web_cache.h",
+  "+third_party/blink/public/platform/web_display_mode.h",
+  "+third_party/blink/public/platform/web_loading_behavior_flag.h",
+  "+third_party/blink/public/platform/web_gesture_event.h",
+  "+third_party/blink/public/platform/web_input_event.h",
+  "+third_party/blink/public/platform/web_mouse_event.h",
+  "+third_party/blink/public/platform/web_mouse_wheel_event.h",
+  "+third_party/blink/public/platform/web_referrer_policy.h",
+  "+third_party/blink/public/platform/web_security_style.h",
+  "+third_party/blink/public/platform/web_sudden_termination_disabler_type.h",
+  "+third_party/blink/public/platform/modules/notifications/web_notification_constants.h",
+  "+third_party/blink/public/platform/modules/remoteplayback/web_remote_playback_availability.h",
+  "+third_party/blink/public/platform/modules/screen_orientation/web_screen_orientation_lock_type.h",
+  "+third_party/blink/public/public_buildflags.h",
+  "+third_party/blink/public/web/web_context_menu_data.h",
+  "+third_party/blink/public/web/web_find_options.h",
+  "+third_party/blink/public/web/web_media_player_action.h",
+  "+third_party/blink/public/web/web_plugin_action.h",
+  "+third_party/blink/public/web/web_presentation_receiver_flags.h",
+  "+third_party/blink/public/web/web_text_direction.h",
+  "+third_party/blink/public/web/web_triggering_event_info.h",
 
   # Allow mojo generated files in WebKit. These files use STL types and
   # don't use WTF types.
-  "+third_party/WebKit/public/platform/web_feature.mojom.h",
-  "+third_party/WebKit/public/platform/media_engagement.mojom.h",
-  "+third_party/WebKit/public/platform/modules/app_banner/app_banner.mojom.h",
-  "+third_party/WebKit/public/platform/modules/budget_service/budget_service.mojom.h",
-  "+third_party/WebKit/public/platform/modules/insecure_input/insecure_input_service.mojom.h",
-  "+third_party/WebKit/public/platform/modules/installation/installation.mojom.h",
-  "+third_party/WebKit/public/platform/modules/installedapp/installed_app_provider.mojom.h",
-  "+third_party/WebKit/public/platform/modules/payments/payment_app.mojom.h",
-  "+third_party/WebKit/public/platform/modules/payments/payment_request.mojom.h",
-  "+third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h",
-  "+third_party/WebKit/public/platform/modules/presentation/presentation.mojom.h",
-  "+third_party/WebKit/public/platform/modules/webauth/authenticator.mojom.h",
-  "+third_party/WebKit/public/platform/modules/webshare/webshare.mojom.h",
-  "+third_party/WebKit/public/platform/oom_intervention.mojom.h",
-  "+third_party/WebKit/public/platform/site_engagement.mojom.h",
-  "+third_party/WebKit/public/web/window_features.mojom.h",
+  "+third_party/blink/public/platform/web_feature.mojom.h",
+  "+third_party/blink/public/platform/media_engagement.mojom.h",
+  "+third_party/blink/public/platform/modules/app_banner/app_banner.mojom.h",
+  "+third_party/blink/public/platform/modules/budget_service/budget_service.mojom.h",
+  "+third_party/blink/public/platform/modules/insecure_input/insecure_input_service.mojom.h",
+  "+third_party/blink/public/platform/modules/installation/installation.mojom.h",
+  "+third_party/blink/public/platform/modules/installedapp/installed_app_provider.mojom.h",
+  "+third_party/blink/public/platform/modules/payments/payment_app.mojom.h",
+  "+third_party/blink/public/platform/modules/payments/payment_request.mojom.h",
+  "+third_party/blink/public/platform/modules/permissions/permission_status.mojom.h",
+  "+third_party/blink/public/platform/modules/presentation/presentation.mojom.h",
+  "+third_party/blink/public/platform/modules/webauth/authenticator.mojom.h",
+  "+third_party/blink/public/platform/modules/webshare/webshare.mojom.h",
+  "+third_party/blink/public/platform/oom_intervention.mojom.h",
+  "+third_party/blink/public/platform/site_engagement.mojom.h",
+  "+third_party/blink/public/web/window_features.mojom.h",
 
   # The following restrictions are for ChromeOS and in particular mus/mash where
   # Ozone does not run in process. If the linux build transitions to Ozone then

chrome/browser/after_startup_task_utils.cc

@@ -25,7 +25,7 @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
-#include "third_party/WebKit/public/mojom/page/page_visibility_state.mojom.h"
+#include "third_party/blink/public/mojom/page/page_visibility_state.mojom.h"
 
 using content::BrowserThread;
 using content::WebContents;

chrome/browser/android/DEPS

@@ -14,8 +14,8 @@ include_rules = [
   "+sandbox/linux/seccomp-bpf-helpers",
   "+sandbox/sandbox_buildflags.h",
   "+third_party/gvr-android-sdk",
-  "+third_party/WebKit/public/platform/media_download_in_product_help.mojom.h",
-  "+third_party/WebKit/public/platform/unhandled_tap_notifier.mojom.h",
+  "+third_party/blink/public/platform/media_download_in_product_help.mojom.h",
+  "+third_party/blink/public/platform/unhandled_tap_notifier.mojom.h",
 ]
 
 specific_include_rules = {

chrome/browser/android/bottombar/overlay_panel_content.cc

@@ -25,7 +25,7 @@
 #include "content/public/common/browser_controls_state.h"
 #include "jni/OverlayPanelContent_jni.h"
 #include "net/url_request/url_fetcher_impl.h"
-#include "third_party/WebKit/public/common/associated_interfaces/associated_interface_provider.h"
+#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
 #include "ui/android/view_android.h"
 
 using base::android::JavaParamRef;

chrome/browser/android/contextualsearch/unhandled_tap_notifier_impl.h

@@ -7,7 +7,7 @@
 
 #include "base/macros.h"
 #include "chrome/browser/android/contextualsearch/unhandled_tap_web_contents_observer.h"
-#include "third_party/WebKit/public/platform/unhandled_tap_notifier.mojom.h"
+#include "third_party/blink/public/platform/unhandled_tap_notifier.mojom.h"
 
 namespace contextual_search {
 

chrome/browser/android/contextualsearch/unhandled_tap_web_contents_observer.cc

@@ -7,7 +7,7 @@
 #include <utility>
 
 #include "build/build_config.h"
-#include "third_party/WebKit/public/public_buildflags.h"
+#include "third_party/blink/public/public_buildflags.h"
 
 #if BUILDFLAG(ENABLE_UNHANDLED_TAP)
 #include "chrome/browser/android/contextualsearch/unhandled_tap_notifier_impl.h"

chrome/browser/android/customtabs/detached_resource_request_android.cc

@@ -10,7 +10,7 @@
 #include "chrome/browser/profiles/profile_android.h"
 #include "content/public/common/referrer.h"
 #include "jni/CustomTabsConnection_jni.h"
-#include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
+#include "third_party/blink/public/platform/web_referrer_policy.h"
 #include "url/gurl.h"
 
 namespace customtabs {

chrome/browser/android/download/download_manager_service.cc

@@ -24,7 +24,7 @@
 #include "jni/DownloadInfo_jni.h"
 #include "jni/DownloadItem_jni.h"
 #include "jni/DownloadManagerService_jni.h"
-#include "third_party/WebKit/public/common/mime_util/mime_util.h"
+#include "third_party/blink/public/common/mime_util/mime_util.h"
 
 using base::android::JavaParamRef;
 using base::android::ConvertJavaStringToUTF8;

chrome/browser/android/metrics/launch_metrics.cc

@@ -15,7 +15,7 @@
 #include "components/rappor/rappor_service_impl.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/LaunchMetrics_jni.h"
-#include "third_party/WebKit/public/platform/WebDisplayMode.h"
+#include "third_party/blink/public/platform/web_display_mode.h"
 #include "url/gurl.h"
 
 using base::android::JavaParamRef;

chrome/browser/android/oom_intervention/oom_intervention_tab_helper.h

@@ -15,7 +15,7 @@
 #include "content/public/browser/web_contents_user_data.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
-#include "third_party/WebKit/public/platform/oom_intervention.mojom.h"
+#include "third_party/blink/public/platform/oom_intervention.mojom.h"
 
 namespace content {
 class WebContents;

chrome/browser/android/payments/service_worker_payment_app_bridge.cc

@@ -21,7 +21,7 @@
 #include "content/public/browser/payment_app_provider.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/ServiceWorkerPaymentAppBridge_jni.h"
-#include "third_party/WebKit/public/platform/modules/payments/payment_app.mojom.h"
+#include "third_party/blink/public/platform/modules/payments/payment_app.mojom.h"
 #include "ui/gfx/android/java_bitmap.h"
 
 namespace {

chrome/browser/android/preferences/website_preference_bridge.cc

@@ -45,7 +45,7 @@
 #include "jni/WebsitePreferenceBridge_jni.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "storage/browser/quota/quota_manager.h"
-#include "third_party/WebKit/public/mojom/quota/quota_types.mojom.h"
+#include "third_party/blink/public/mojom/quota/quota_types.mojom.h"
 #include "url/origin.h"
 #include "url/url_constants.h"
 

chrome/browser/android/search_permissions/search_geolocation_disclosure_tab_helper.cc

@@ -32,7 +32,7 @@
 #include "content/public/browser/web_contents.h"
 #include "jni/GeolocationHeader_jni.h"
 #include "jni/SearchGeolocationDisclosureTabHelper_jni.h"
-#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
+#include "third_party/blink/public/platform/modules/permissions/permission_status.mojom.h"
 #include "url/origin.h"
 
 namespace {

chrome/browser/android/shortcut_info.h

@@ -11,7 +11,7 @@
 
 #include "base/strings/string16.h"
 #include "content/public/common/manifest.h"
-#include "third_party/WebKit/public/platform/modules/screen_orientation/WebScreenOrientationLockType.h"
+#include "third_party/blink/public/platform/modules/screen_orientation/web_screen_orientation_lock_type.h"
 #include "url/gurl.h"
 
 // Information needed to create a shortcut via ShortcutHelper.

chrome/browser/android/tab_android.cc

@@ -78,8 +78,8 @@
 #include "services/service_manager/public/cpp/bind_source_info.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "skia/ext/image_operations.h"
-#include "third_party/WebKit/public/common/associated_interfaces/associated_interface_provider.h"
-#include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
+#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
+#include "third_party/blink/public/platform/web_referrer_policy.h"
 #include "ui/android/view_android.h"
 #include "ui/android/window_android.h"
 #include "ui/base/layout.h"

chrome/browser/android/tab_android.h

@@ -27,7 +27,7 @@
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
-#include "third_party/WebKit/public/platform/media_download_in_product_help.mojom.h"
+#include "third_party/blink/public/platform/media_download_in_product_help.mojom.h"
 
 class GURL;
 class Profile;

chrome/browser/android/vr/android_ui_gesture_target.cc

@@ -7,9 +7,9 @@
 #include <cmath>
 
 #include "jni/AndroidUiGestureTarget_jni.h"
-#include "third_party/WebKit/public/platform/WebGestureEvent.h"
-#include "third_party/WebKit/public/platform/WebInputEvent.h"
-#include "third_party/WebKit/public/platform/WebMouseEvent.h"
+#include "third_party/blink/public/platform/web_gesture_event.h"
+#include "third_party/blink/public/platform/web_input_event.h"
+#include "third_party/blink/public/platform/web_mouse_event.h"
 
 using base::android::JavaParamRef;
 using base::android::JavaRef;

chrome/browser/android/vr/vr_controller.cc

@@ -10,8 +10,8 @@
 #include "base/logging.h"
 #include "base/numerics/math_constants.h"
 #include "base/numerics/ranges.h"
-#include "third_party/WebKit/public/platform/WebGestureEvent.h"
-#include "third_party/WebKit/public/platform/WebInputEvent.h"
+#include "third_party/blink/public/platform/web_gesture_event.h"
+#include "third_party/blink/public/platform/web_input_event.h"
 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr.h"
 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr_controller.h"
 #include "ui/gfx/transform.h"

chrome/browser/android/vr/vr_dialog.cc

@@ -11,7 +11,7 @@
 #include "base/callback_helpers.h"
 #include "chrome/browser/android/vr/vr_shell_delegate.h"
 
-#include "third_party/WebKit/public/platform/WebMouseEvent.h"
+#include "third_party/blink/public/platform/web_mouse_event.h"
 
 using base::android::JavaParamRef;
 

chrome/browser/android/vr/vr_shell.cc

@@ -65,7 +65,7 @@
 #include "jni/VrShellImpl_jni.h"
 #include "services/device/public/mojom/constants.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
-#include "third_party/WebKit/public/platform/WebInputEvent.h"
+#include "third_party/blink/public/platform/web_input_event.h"
 #include "ui/android/window_android.h"
 #include "ui/base/page_transition_types.h"
 #include "ui/display/display.h"

chrome/browser/android/vr/vr_shell_gl.cc

@@ -41,7 +41,7 @@
 #include "device/vr/android/gvr/gvr_device.h"
 #include "device/vr/android/gvr/gvr_gamepad_data_provider.h"
 #include "gpu/config/gpu_driver_bug_workaround_type.h"
-#include "third_party/WebKit/public/platform/WebGestureEvent.h"
+#include "third_party/blink/public/platform/web_gesture_event.h"
 #include "ui/gfx/geometry/angle_conversions.h"
 #include "ui/gl/android/scoped_java_surface.h"
 #include "ui/gl/android/surface_texture.h"

chrome/browser/android/webapk/webapk_info.h

@@ -10,7 +10,7 @@
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "content/public/common/manifest.h"
-#include "third_party/WebKit/public/platform/modules/screen_orientation/WebScreenOrientationLockType.h"
+#include "third_party/blink/public/platform/modules/screen_orientation/web_screen_orientation_lock_type.h"
 
 // Structure with information about a WebAPK.
 //

chrome/browser/android/webapk/webapk_web_manifest_checker_unittest.cc

@@ -7,7 +7,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/common/manifest.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/platform/WebDisplayMode.h"
+#include "third_party/blink/public/platform/web_display_mode.h"
 #include "url/gurl.h"
 
 namespace {

chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc

@@ -27,8 +27,8 @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/manifest.h"
-#include "third_party/WebKit/public/common/associated_interfaces/associated_interface_provider.h"
-#include "third_party/WebKit/public/platform/modules/screen_orientation/WebScreenOrientationLockType.h"
+#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
+#include "third_party/blink/public/platform/modules/screen_orientation/web_screen_orientation_lock_type.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/favicon_size.h"
 #include "url/gurl.h"

chrome/browser/android/webapps/add_to_homescreen_data_fetcher_unittest.cc

@@ -26,7 +26,7 @@
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/manifest.h"
-#include "third_party/WebKit/public/platform/WebDisplayMode.h"
+#include "third_party/blink/public/platform/web_display_mode.h"
 #include "ui/gfx/image/image_unittest_util.h"
 #include "url/gurl.h"
 

chrome/browser/android/webapps/add_to_homescreen_manager.cc

@@ -22,7 +22,7 @@
 #include "jni/AddToHomescreenManager_jni.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
-#include "third_party/WebKit/public/platform/modules/installation/installation.mojom.h"
+#include "third_party/blink/public/platform/modules/installation/installation.mojom.h"
 #include "ui/gfx/android/java_bitmap.h"
 
 using base::android::JavaParamRef;

chrome/browser/apps/guest_view/web_view_browsertest.cc

@@ -92,7 +92,7 @@
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "ppapi/buildflags/buildflags.h"
-#include "third_party/WebKit/public/platform/WebMouseEvent.h"
+#include "third_party/blink/public/platform/web_mouse_event.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/compositor.h"

chrome/browser/banners/app_banner_manager.cc

@@ -28,7 +28,7 @@
 #include "content/public/browser/web_contents.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
-#include "third_party/WebKit/public/platform/modules/installation/installation.mojom.h"
+#include "third_party/blink/public/platform/modules/installation/installation.mojom.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 #if defined(OS_ANDROID)

chrome/browser/banners/app_banner_manager.h

@@ -19,8 +19,8 @@
 #include "chrome/browser/installable/installable_metrics.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "third_party/WebKit/public/platform/WebDisplayMode.h"
-#include "third_party/WebKit/public/platform/modules/app_banner/app_banner.mojom.h"
+#include "third_party/blink/public/platform/modules/app_banner/app_banner.mojom.h"
+#include "third_party/blink/public/platform/web_display_mode.h"
 
 class InstallableManager;
 class SkBitmap;

chrome/browser/banners/app_banner_metrics.h

@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_BANNERS_APP_BANNER_METRICS_H_
 
 #include "chrome/browser/installable/installable_logging.h"
-#include "third_party/WebKit/public/platform/WebDisplayMode.h"
+#include "third_party/blink/public/platform/web_display_mode.h"
 
 namespace banners {
 

chrome/browser/browsing_data/browsing_data_quota_helper_impl.h

@@ -17,7 +17,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/browsing_data/browsing_data_quota_helper.h"
-#include "third_party/WebKit/public/mojom/quota/quota_types.mojom.h"
+#include "third_party/blink/public/mojom/quota/quota_types.mojom.h"
 
 class GURL;
 

chrome/browser/browsing_data/counters/site_data_counting_helper.h

@@ -9,7 +9,7 @@
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/ssl/channel_id_store.h"
-#include "third_party/WebKit/public/mojom/quota/quota_types.mojom.h"
+#include "third_party/blink/public/mojom/quota/quota_types.mojom.h"
 
 class Profile;
 class BrowsingDataFlashLSOHelper;

chrome/browser/budget_service/budget_database.h

@@ -14,7 +14,7 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "components/leveldb_proto/proto_database.h"
-#include "third_party/WebKit/public/platform/modules/budget_service/budget_service.mojom.h"
+#include "third_party/blink/public/platform/modules/budget_service/budget_service.mojom.h"
 
 namespace base {
 class Clock;

chrome/browser/budget_service/budget_manager.cc

@@ -13,7 +13,7 @@
 #include "chrome/browser/engagement/site_engagement_score.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/common/origin_util.h"
-#include "third_party/WebKit/public/platform/modules/budget_service/budget_service.mojom.h"
+#include "third_party/blink/public/platform/modules/budget_service/budget_service.mojom.h"
 #include "url/origin.h"
 
 BudgetManager::BudgetManager(Profile* profile)

chrome/browser/budget_service/budget_manager.h

@@ -12,7 +12,7 @@
 #include "base/gtest_prod_util.h"
 #include "chrome/browser/budget_service/budget_database.h"
 #include "components/keyed_service/core/keyed_service.h"
-#include "third_party/WebKit/public/platform/modules/budget_service/budget_service.mojom.h"
+#include "third_party/blink/public/platform/modules/budget_service/budget_service.mojom.h"
 
 class Profile;
 

chrome/browser/budget_service/budget_manager_browsertest.cc

@@ -23,7 +23,7 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
-#include "third_party/WebKit/public/platform/modules/budget_service/budget_service.mojom.h"
+#include "third_party/blink/public/platform/modules/budget_service/budget_service.mojom.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 

chrome/browser/budget_service/budget_manager_unittest.cc

@@ -16,7 +16,7 @@
 #include "components/prefs/scoped_user_pref_update.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/platform/modules/budget_service/budget_service.mojom.h"
+#include "third_party/blink/public/platform/modules/budget_service/budget_service.mojom.h"
 #include "url/origin.h"
 
 namespace {

chrome/browser/budget_service/budget_service_impl.h

@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_BUDGET_SERVICE_BUDGET_SERVICE_IMPL_H_
 
 #include "base/macros.h"
-#include "third_party/WebKit/public/platform/modules/budget_service/budget_service.mojom.h"
+#include "third_party/blink/public/platform/modules/budget_service/budget_service.mojom.h"
 #include "url/origin.h"
 
 namespace content {

chrome/browser/chrome_content_browser_client.cc

@@ -251,9 +251,9 @@
 #include "services/service_manager/public/mojom/connector.mojom.h"
 #include "services/service_manager/sandbox/sandbox_type.h"
 #include "storage/browser/fileapi/external_mount_points.h"
-#include "third_party/WebKit/public/mojom/page/page_visibility_state.mojom.h"
-#include "third_party/WebKit/public/platform/modules/installedapp/installed_app_provider.mojom.h"
-#include "third_party/WebKit/public/platform/modules/webshare/webshare.mojom.h"
+#include "third_party/blink/public/mojom/page/page_visibility_state.mojom.h"
+#include "third_party/blink/public/platform/modules/installedapp/installed_app_provider.mojom.h"
+#include "third_party/blink/public/platform/modules/webshare/webshare.mojom.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_features.h"
@@ -319,8 +319,8 @@
 #include "content/public/browser/android/java_interfaces.h"
 #include "services/proxy_resolver/proxy_resolver_service.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
-#include "third_party/WebKit/public/platform/modules/payments/payment_request.mojom.h"
-#include "third_party/WebKit/public/platform/modules/webauth/authenticator.mojom.h"
+#include "third_party/blink/public/platform/modules/payments/payment_request.mojom.h"
+#include "third_party/blink/public/platform/modules/webauth/authenticator.mojom.h"
 #include "ui/base/resource/resource_bundle_android.h"
 #include "ui/base/ui_base_paths.h"
 #elif defined(OS_POSIX)

chrome/browser/chrome_find_request_manager_browsertest.cc

@@ -16,7 +16,7 @@
 #include "content/public/test/find_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "net/dns/mock_host_resolver.h"
-#include "third_party/WebKit/public/web/WebFindOptions.h"
+#include "third_party/blink/public/web/web_find_options.h"
 
 namespace content {
 

chrome/browser/chrome_quota_permission_context.cc

@@ -22,7 +22,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/web_contents.h"
-#include "third_party/WebKit/public/mojom/quota/quota_types.mojom.h"
+#include "third_party/blink/public/mojom/quota/quota_types.mojom.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 

chrome/browser/chrome_security_exploit_browsertest.cc

@@ -26,7 +26,7 @@
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "storage/browser/blob/blob_registry_impl.h"
-#include "third_party/WebKit/public/mojom/blob/blob_url_store.mojom.h"
+#include "third_party/blink/public/mojom/blob/blob_url_store.mojom.h"
 
 // The goal of these tests is to "simulate" exploited renderer processes, which
 // can send arbitrary IPC messages and confuse browser process internal state,

chrome/browser/chromeos/BUILD.gn

@@ -181,8 +181,8 @@ source_set("chromeos") {
     "//skia",
     "//storage/browser",
     "//storage/common",
-    "//third_party/WebKit/public/common",
     "//third_party/adobe/flash:flapper_version_h",
+    "//third_party/blink/public/common",
     "//third_party/cacheinvalidation",
     "//third_party/icu",
     "//third_party/leveldatabase",
@@ -2201,7 +2201,7 @@ source_set("unit_tests") {
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
-    "//third_party/WebKit/public:blink_headers",
+    "//third_party/blink/public:blink_headers",
     "//third_party/icu",
     "//third_party/leveldatabase",
     "//ui/arc:test_support",

chrome/browser/chromeos/accessibility/select_to_speak_event_handler.cc

@@ -17,7 +17,7 @@
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_host.h"
-#include "third_party/WebKit/public/platform/WebMouseEvent.h"
+#include "third_party/blink/public/platform/web_mouse_event.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"

chrome/browser/chromeos/attestation/platform_verification_flow.cc

@@ -38,7 +38,7 @@
 #include "content/public/common/url_constants.h"
 #include "net/cert/pem_tokenizer.h"
 #include "net/cert/x509_certificate.h"
-#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
+#include "third_party/blink/public/platform/modules/permissions/permission_status.mojom.h"
 
 namespace {
 

chrome/browser/chromeos/file_manager/file_tasks.cc

@@ -43,7 +43,7 @@
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_set.h"
 #include "storage/browser/fileapi/file_system_url.h"
-#include "third_party/WebKit/public/common/mime_util/mime_util.h"
+#include "third_party/blink/public/common/mime_util/mime_util.h"
 
 using extensions::Extension;
 using extensions::api::file_manager_private::Verb;

chrome/browser/chromeos/first_run/first_run_view.cc

@@ -11,7 +11,7 @@
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
-#include "third_party/WebKit/public/platform/WebInputEvent.h"
+#include "third_party/blink/public/platform/web_input_event.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/views/controls/webview/webview.h"
 #include "url/gurl.h"

chrome/browser/chromeos/login/ui/webui_login_view.cc

@@ -59,7 +59,7 @@
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/renderer_preferences.h"
 #include "extensions/browser/view_type_utils.h"
-#include "third_party/WebKit/public/platform/WebInputEvent.h"
+#include "third_party/blink/public/platform/web_input_event.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/keyboard/keyboard_controller.h"

chrome/browser/client_hints/DEPS

@@ -2,7 +2,7 @@ include_rules = [
   # No inclusion of WebKit from the browser, other than the ones in
   # WebKit/public/common, or the ones that are strictly enum/POD,
   # header-only types, and some selected common code.
-  "-third_party/WebKit",
-  "+third_party/WebKit/public/common",
-  "+third_party/WebKit/public/platform/WebClientHintsType.h",
+  "-third_party/blink",
+  "+third_party/blink/public/common",
+  "+third_party/blink/public/platform/web_client_hints_type.h",
 ]

chrome/browser/client_hints/client_hints.cc

@@ -23,9 +23,9 @@
 #include "net/http/http_request_headers.h"
 #include "net/nqe/effective_connection_type.h"
 #include "net/url_request/url_request.h"
-#include "third_party/WebKit/public/common/client_hints/client_hints.h"
-#include "third_party/WebKit/public/common/device_memory/approximated_device_memory.h"
-#include "third_party/WebKit/public/platform/WebClientHintsType.h"
+#include "third_party/blink/public/common/client_hints/client_hints.h"
+#include "third_party/blink/public/common/device_memory/approximated_device_memory.h"
+#include "third_party/blink/public/platform/web_client_hints_type.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "url/gurl.h"

chrome/browser/client_hints/client_hints_browsertest.cc

@@ -33,7 +33,7 @@
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "services/network/public/cpp/network_switches.h"
-#include "third_party/WebKit/public/common/client_hints/client_hints.h"
+#include "third_party/blink/public/common/client_hints/client_hints.h"
 
 namespace {
 

chrome/browser/clipboard/clipboard_read_permission_context.cc

@@ -8,7 +8,7 @@
 #include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/common/chrome_features.h"
 #include "components/content_settings/core/common/content_settings_types.h"
-#include "third_party/WebKit/public/mojom/feature_policy/feature_policy.mojom.h"
+#include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom.h"
 
 ClipboardReadPermissionContext::ClipboardReadPermissionContext(Profile* profile)
     : PermissionContextBase(profile,

chrome/browser/clipboard/clipboard_write_permission_context.cc

@@ -6,7 +6,7 @@
 
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
-#include "third_party/WebKit/public/mojom/feature_policy/feature_policy.mojom.h"
+#include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom.h"
 #include "url/gurl.h"
 
 ClipboardWritePermissionContext::ClipboardWritePermissionContext(

chrome/browser/content_settings/mixed_content_settings_tab_helper.cc

@@ -9,7 +9,7 @@
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/site_instance.h"
-#include "third_party/WebKit/public/common/associated_interfaces/associated_interface_provider.h"
+#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
 
 using content::BrowserThread;
 using content::WebContents;

chrome/browser/content_settings/tab_specific_content_settings.cc

@@ -53,7 +53,7 @@
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/cookies/canonical_cookie.h"
 #include "storage/common/fileapi/file_system_types.h"
-#include "third_party/WebKit/public/common/associated_interfaces/associated_interface_provider.h"
+#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
 #include "url/origin.h"
 
 using content::BrowserThread;

chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc

@@ -19,7 +19,7 @@
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
-#include "third_party/WebKit/public/web/WebContextMenuData.h"
+#include "third_party/blink/public/web/web_context_menu_data.h"
 
 using content::WebContents;
 

chrome/browser/devtools/BUILD.gn

@@ -39,10 +39,11 @@ if (!is_android) {
     script = _inspector_protocol + "/ConcatenateProtocols.py"
 
     deps = [
-      "//third_party/WebKit/Source/core/inspector:protocol_version",
+      "//third_party/blink/renderer/core/inspector:protocol_version",
     ]
 
-    _blink_protocol_path = "$root_gen_dir/blink/core/inspector/protocol.json"
+    _blink_protocol_path =
+        "$root_gen_dir/third_party/blink/renderer/core/inspector/protocol.json"
     inputs = [
       _blink_protocol_path,
     ]
@@ -96,7 +97,7 @@ static_library("devtools") {
     "//content/public/browser",
     "//net",
     "//services/viz/privileged/interfaces/compositing",
-    "//third_party/WebKit/public:buildflags",
+    "//third_party/blink/public:buildflags",
     "//ui/events:dom_keycode_converter",
   ]