Remove references to thrid_party/WebKit in various code

This CL enables _CheckForRelativeIncludes presubmit check for
third_party/blink.

Change-Id: Ida579dad3adb3d156b3ab6f800fdfd7e4c0559a2
Bug: 622551
Reviewed-on: https://chromium-review.googlesource.com/c/1356719Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612622}

.gn

@@ -317,7 +317,6 @@ check_targets = [
   "//third_party/Python-Markdown/*",
 
   # "//third_party/SPIRV-Tools/*",  # 30ish errors
-  "//third_party/WebKit/*",
   "//third_party/abseil-cpp/*",
   "//third_party/accessibility-audit/*",
   "//third_party/accessibility_test_framework/*",

DEPS

@@ -1978,7 +1978,6 @@ hooks = [
         'src/third_party/blink/tools',  # See http://crbug.com/625877.
         'src/third_party/catapult',
         'src/third_party/closure_compiler/build',
-        'src/third_party/WebKit/Tools/Scripts',  # See http://crbug.com/625877.
         'src/tools',
     ],
   },

PRESUBMIT.py

@@ -15,7 +15,7 @@ _EXCLUDED_PATHS = (
     r"^native_client_sdk[\\/]src[\\/]tools[\\/].*.mk",
     r"^net[\\/]tools[\\/]spdyshark[\\/].*",
     r"^skia[\\/].*",
-    r"^third_party[\\/](WebKit|blink)[\\/].*",
+    r"^third_party[\\/]blink[\\/].*",
     r"^third_party[\\/]breakpad[\\/].*",
     r"^v8[\\/].*",
     r".*MakeFile$",
@@ -1551,7 +1551,7 @@ def _CheckAddedDepsHaveTargetApprovals(input_api, output_api):
   virtual_depended_on_files = set()
 
   file_filter = lambda f: not input_api.re.match(
-      r"^third_party[\\/](WebKit|blink)[\\/].*", f.LocalPath())
+      r"^third_party[\\/]blink[\\/].*", f.LocalPath())
   for f in input_api.AffectedFiles(include_deletes=False,
                                    file_filter=file_filter):
     filename = input_api.os_path.basename(f.LocalPath())
@@ -2178,9 +2178,7 @@ def _CheckUselessForwardDeclarations(input_api, output_api):
   for f in input_api.AffectedFiles(include_deletes=False):
     if (f.LocalPath().startswith('third_party') and
         not f.LocalPath().startswith('third_party/blink') and
-        not f.LocalPath().startswith('third_party\\blink') and
-        not f.LocalPath().startswith('third_party/WebKit') and
-        not f.LocalPath().startswith('third_party\\WebKit')):
+        not f.LocalPath().startswith('third_party\\blink')):
       continue
 
     if not f.LocalPath().endswith('.h'):
@@ -2734,8 +2732,8 @@ def _CheckForRelativeIncludes(input_api, output_api):
   bad_files = {}
   for f in input_api.AffectedFiles(include_deletes=False):
     if (f.LocalPath().startswith('third_party') and
-      not f.LocalPath().startswith('third_party/WebKit') and
-      not f.LocalPath().startswith('third_party\\WebKit')):
+      not f.LocalPath().startswith('third_party/blink') and
+      not f.LocalPath().startswith('third_party\\blink')):
       continue
 
     if not CppChecker.IsCppFile(f.LocalPath()):

PRESUBMIT_test.py

@@ -1377,11 +1377,11 @@ class ForwardDeclarationTest(unittest.TestCase):
   def testBlinkHeaders(self):
     mock_input_api = MockInputApi()
     mock_input_api.files = [
-      MockAffectedFile('third_party/WebKit/header.h', [
+      MockAffectedFile('third_party/blink/header.h', [
         'class DummyClass;',
         'struct DummyStruct;',
       ]),
-      MockAffectedFile('third_party\\WebKit\\header.h', [
+      MockAffectedFile('third_party\\blink\\header.h', [
         'class DummyClass;',
         'struct DummyStruct;',
       ])
@@ -1445,7 +1445,7 @@ class RelativeIncludesTest(unittest.TestCase):
   def testRelativeIncludeWebKitProducesError(self):
     mock_input_api = MockInputApi()
     mock_input_api.files = [
-      MockAffectedFile('third_party/WebKit/test.cpp',
+      MockAffectedFile('third_party/blink/test.cpp',
                        ['#include "../header.h']),
     ]
 

ios/build/config.gni

@@ -10,10 +10,10 @@ _ios_conceptually_bad_dependencies = [
   "//dbus/*",
   "//jingle:jingle",
   "//media/*",
+  "//third_party/blink/*",
   "//third_party/ffmpeg/*",
   "//third_party/hunspell_dictionaries/*",
   "//third_party/webgl/*",
-  "//third_party/WebKit/*",
   "//third_party/webrtc:webrtc",
 ]
 

mojo/public/cpp/bindings/tests/BUILD.gn

@@ -68,7 +68,7 @@ source_set("tests") {
   ]
 
   if (is_ios) {
-    assert_no_deps = [ "//third_party/WebKit/*" ]
+    assert_no_deps = [ "//third_party/blink/*" ]
   } else {
     sources += [
       "pickle_unittest.cc",

ppapi/native_client/BUILD.gn

@@ -37,7 +37,7 @@ if (is_nacl) {
       # Skia is one of the easiest dependencies to accidentally add since a
       # bunch of graphics and GPU code uses it.
       "//skia/*",
-      "//third_party/WebKit/*",
+      "//third_party/blink/*",
     ]
   }
 

tools/android/native_lib_memory/visualize.js

@@ -34,7 +34,7 @@ function getFillColor(d) {
 const colors = d3.scale.category20();
 let colorIndex = 1;
 const COLOR_MAPPING = [
-  [["third_party/WebKit"], colors(colorIndex++), "Blink"],
+  [["third_party/blink"], colors(colorIndex++), "Blink"],
   [["v8"], colors(colorIndex++), "V8"],
   [["base"], colors(colorIndex++), "//base"],
   [["content"], colors(colorIndex++), "//content"],

tools/checklicenses/checklicenses.py

@@ -168,12 +168,6 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
         'UNKNOWN',
     ],
 
-    # TODO(tkent): Remove this entry after the move is completed.
-    # crbug.com/622551
-    'third_party/WebKit': [
-        'UNKNOWN',
-    ],
-
     # https://bugs.chromium.org/p/swiftshader/issues/detail?id=1
     'third_party/swiftshader': [
         'UNKNOWN',