Move webkitpy/w3c to blinkpy/w3c.
* Add webkitpy/common/add_blinkpy.py to help blinkpy.w3c dependency from
webkitpy.
* This CL doesn't sort import directives intentionally because we'll
change other webkitpy" to "blinkpy" soon.
Change-Id: Ieb2d8617e10b4d8a10136bd7924022a51ee37571
Reviewed-on: https://chromium-review.googlesource.com/1014921
Reviewed-by: Nico Weber <[email protected]>
Reviewed-by: Quinten Yearsley <[email protected]>
Commit-Queue: Kent Tamura <[email protected]>
Cr-Commit-Position: refs/heads/master@{#551919}diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/add_blinkpy.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/add_blinkpy.py
new file mode 100644
index 0000000..f6615881
--- /dev/null
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/common/add_blinkpy.py
@@ -0,0 +1,22 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""Add the path of blinkpy to sys.path.
+
+You don't need to call a function to do it. You need just import this. e.g.
+ import webkitpy.common.add_blinkpy # pylint: disable=unused-import
+ or
+ from webkitpy.common import add_blinkpy # pylint: disable=unused-import
+
+This is a transitional solution to handle both of blinkpy and webkitpy. We'll
+remove this file when we finish moving webkitpy to blinkpy.
+"""
+
+import os
+import sys
+
+# Without abspath(), PathFinder can't find chromium_base correctly.
+sys.path.append(os.path.abspath(
+ os.path.join(os.path.dirname(__file__), '..', '..', '..', '..', '..',
+ 'blink', 'tools')))
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
index 9b5090f..46bedd7 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
@@ -43,6 +43,7 @@
import sys
import time
+from webkitpy.common import add_blinkpy # pylint: disable=unused-import
from webkitpy.common import exit_codes
from webkitpy.common.net.file_uploader import FileUploader
from webkitpy.common.path_finder import PathFinder
@@ -55,7 +56,7 @@
from webkitpy.layout_tests.models import test_run_results
from webkitpy.layout_tests.models.test_input import TestInput
from webkitpy.tool import grammar
-from webkitpy.w3c.wpt_manifest import WPTManifest
+from blinkpy.w3c.wpt_manifest import WPTManifest
_log = logging.getLogger(__name__)
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/lint_test_expectations.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/lint_test_expectations.py
index d3dd34e..9e986df3 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/lint_test_expectations.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/lint_test_expectations.py
@@ -31,12 +31,13 @@
import optparse
import traceback
+from webkitpy.common import add_blinkpy # pylint: disable=unused-import
from webkitpy.common import exit_codes
from webkitpy.common.host import Host
from webkitpy.common.system.log_utils import configure_logging
from webkitpy.layout_tests.models import test_expectations
from webkitpy.layout_tests.port.factory import platform_options
-from webkitpy.w3c.wpt_manifest import WPTManifest
+from blinkpy.w3c.wpt_manifest import WPTManifest
_log = logging.getLogger(__name__)
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
index f76680b..1f7cc94 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
@@ -42,6 +42,7 @@
import sys
import tempfile
+from webkitpy.common import add_blinkpy # pylint: disable=unused-import
from webkitpy.common import exit_codes
from webkitpy.common import find_files
from webkitpy.common import read_checksum_from_png
@@ -59,7 +60,7 @@
from webkitpy.layout_tests.servers import apache_http
from webkitpy.layout_tests.servers import pywebsocket
from webkitpy.layout_tests.servers import wptserve
-from webkitpy.w3c.wpt_manifest import WPTManifest
+from blinkpy.w3c.wpt_manifest import WPTManifest
_log = logging.getLogger(__name__)
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_cl.py b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_cl.py
index faa6b1c..d053b4b 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_cl.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_cl.py
@@ -8,11 +8,12 @@
import logging
import optparse
+from webkitpy.common import add_blinkpy # pylint: disable=unused-import
from webkitpy.common.net.git_cl import GitCL, TryJobStatus
from webkitpy.common.path_finder import PathFinder
from webkitpy.tool.commands.rebaseline import AbstractParallelRebaselineCommand
from webkitpy.tool.commands.rebaseline import TestBaselineSet
-from webkitpy.w3c.wpt_manifest import WPTManifest
+from blinkpy.w3c.wpt_manifest import WPTManifest
_log = logging.getLogger(__name__)
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/__init__.py b/third_party/blink/tools/blinkpy/w3c/__init__.py
similarity index 100%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/__init__.py
rename to third_party/blink/tools/blinkpy/w3c/__init__.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/chromium_commit.py b/third_party/blink/tools/blinkpy/w3c/chromium_commit.py
similarity index 96%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/chromium_commit.py
rename to third_party/blink/tools/blinkpy/w3c/chromium_commit.py
index cb72d08..048dc59 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/chromium_commit.py
+++ b/third_party/blink/tools/blinkpy/w3c/chromium_commit.py
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-from webkitpy.w3c.chromium_finder import absolute_chromium_dir, absolute_chromium_wpt_dir
-from webkitpy.w3c.common import is_file_exportable
+from blinkpy.w3c.chromium_finder import absolute_chromium_dir, absolute_chromium_wpt_dir
+from blinkpy.w3c.common import is_file_exportable
from webkitpy.common.system.executive import ScriptError
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/chromium_commit_mock.py b/third_party/blink/tools/blinkpy/w3c/chromium_commit_mock.py
similarity index 100%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/chromium_commit_mock.py
rename to third_party/blink/tools/blinkpy/w3c/chromium_commit_mock.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/chromium_commit_unittest.py b/third_party/blink/tools/blinkpy/w3c/chromium_commit_unittest.py
similarity index 97%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/chromium_commit_unittest.py
rename to third_party/blink/tools/blinkpy/w3c/chromium_commit_unittest.py
index ddbb344..b325442 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/chromium_commit_unittest.py
+++ b/third_party/blink/tools/blinkpy/w3c/chromium_commit_unittest.py
@@ -7,7 +7,7 @@
from webkitpy.common.host_mock import MockHost
from webkitpy.common.system.executive import ScriptError
from webkitpy.common.system.executive_mock import MockExecutive, mock_git_commands
-from webkitpy.w3c.chromium_commit import ChromiumCommit
+from blinkpy.w3c.chromium_commit import ChromiumCommit
CHROMIUM_WPT_DIR = 'third_party/WebKit/LayoutTests/external/wpt/'
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/chromium_exportable_commits.py b/third_party/blink/tools/blinkpy/w3c/chromium_exportable_commits.py
similarity index 97%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/chromium_exportable_commits.py
rename to third_party/blink/tools/blinkpy/w3c/chromium_exportable_commits.py
index eae2f90..5f75a98 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/chromium_exportable_commits.py
+++ b/third_party/blink/tools/blinkpy/w3c/chromium_exportable_commits.py
@@ -2,9 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-from webkitpy.w3c.chromium_commit import ChromiumCommit
-from webkitpy.w3c.chromium_finder import absolute_chromium_dir
-from webkitpy.w3c.common import CHROMIUM_WPT_DIR
+from blinkpy.w3c.chromium_commit import ChromiumCommit
+from blinkpy.w3c.chromium_finder import absolute_chromium_dir
+from blinkpy.w3c.common import CHROMIUM_WPT_DIR
DEFAULT_COMMIT_HISTORY_WINDOW = 5000
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/chromium_exportable_commits_unittest.py b/third_party/blink/tools/blinkpy/w3c/chromium_exportable_commits_unittest.py
similarity index 96%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/chromium_exportable_commits_unittest.py
rename to third_party/blink/tools/blinkpy/w3c/chromium_exportable_commits_unittest.py
index 8439266..d730e05b 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/chromium_exportable_commits_unittest.py
+++ b/third_party/blink/tools/blinkpy/w3c/chromium_exportable_commits_unittest.py
@@ -6,16 +6,16 @@
from webkitpy.common.host_mock import MockHost
from webkitpy.common.system.executive_mock import mock_git_commands
-from webkitpy.w3c.chromium_commit import ChromiumCommit
-from webkitpy.w3c.chromium_commit_mock import MockChromiumCommit
-from webkitpy.w3c.chromium_exportable_commits import (
+from blinkpy.w3c.chromium_commit import ChromiumCommit
+from blinkpy.w3c.chromium_commit_mock import MockChromiumCommit
+from blinkpy.w3c.chromium_exportable_commits import (
_exportable_commits_since,
get_commit_export_state,
CommitExportState
)
-from webkitpy.w3c.local_wpt_mock import MockLocalWPT
-from webkitpy.w3c.wpt_github import PullRequest
-from webkitpy.w3c.wpt_github_mock import MockWPTGitHub
+from blinkpy.w3c.local_wpt_mock import MockLocalWPT
+from blinkpy.w3c.wpt_github import PullRequest
+from blinkpy.w3c.wpt_github_mock import MockWPTGitHub
class ChromiumExportableCommitsTest(unittest.TestCase):
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/chromium_finder.py b/third_party/blink/tools/blinkpy/w3c/chromium_finder.py
similarity index 100%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/chromium_finder.py
rename to third_party/blink/tools/blinkpy/w3c/chromium_finder.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/common.py b/third_party/blink/tools/blinkpy/w3c/common.py
similarity index 100%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/common.py
rename to third_party/blink/tools/blinkpy/w3c/common.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/common_unittest.py b/third_party/blink/tools/blinkpy/w3c/common_unittest.py
similarity index 98%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/common_unittest.py
rename to third_party/blink/tools/blinkpy/w3c/common_unittest.py
index a2fa5e7..a129d154a 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/common_unittest.py
+++ b/third_party/blink/tools/blinkpy/w3c/common_unittest.py
@@ -6,7 +6,7 @@
import unittest
from webkitpy.common.host_mock import MockHost
-from webkitpy.w3c.common import (
+from blinkpy.w3c.common import (
read_credentials,
is_testharness_baseline,
is_basename_skipped,
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/directory_owners_extractor.py b/third_party/blink/tools/blinkpy/w3c/directory_owners_extractor.py
similarity index 100%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/directory_owners_extractor.py
rename to third_party/blink/tools/blinkpy/w3c/directory_owners_extractor.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/directory_owners_extractor_unittest.py b/third_party/blink/tools/blinkpy/w3c/directory_owners_extractor_unittest.py
similarity index 98%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/directory_owners_extractor_unittest.py
rename to third_party/blink/tools/blinkpy/w3c/directory_owners_extractor_unittest.py
index e423775..3d52574 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/directory_owners_extractor_unittest.py
+++ b/third_party/blink/tools/blinkpy/w3c/directory_owners_extractor_unittest.py
@@ -5,7 +5,7 @@
import unittest
from webkitpy.common.system.filesystem_mock import MockFileSystem
-from webkitpy.w3c.directory_owners_extractor import DirectoryOwnersExtractor
+from blinkpy.w3c.directory_owners_extractor import DirectoryOwnersExtractor
ABS_WPT_BASE = '/mock-checkout/third_party/WebKit/LayoutTests/external/wpt'
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/gerrit.py b/third_party/blink/tools/blinkpy/w3c/gerrit.py
similarity index 96%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/gerrit.py
rename to third_party/blink/tools/blinkpy/w3c/gerrit.py
index 3721670..9be1d1e 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/gerrit.py
+++ b/third_party/blink/tools/blinkpy/w3c/gerrit.py
@@ -8,9 +8,9 @@
from urllib2 import HTTPError
from webkitpy.common.net.network_transaction import NetworkTimeout
-from webkitpy.w3c.chromium_commit import ChromiumCommit
-from webkitpy.w3c.chromium_finder import absolute_chromium_dir
-from webkitpy.w3c.common import CHROMIUM_WPT_DIR, is_file_exportable
+from blinkpy.w3c.chromium_commit import ChromiumCommit
+from blinkpy.w3c.chromium_finder import absolute_chromium_dir
+from blinkpy.w3c.common import CHROMIUM_WPT_DIR, is_file_exportable
_log = logging.getLogger(__name__)
URL_BASE = 'https://chromium-review.googlesource.com'
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/gerrit_mock.py b/third_party/blink/tools/blinkpy/w3c/gerrit_mock.py
similarity index 95%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/gerrit_mock.py
rename to third_party/blink/tools/blinkpy/w3c/gerrit_mock.py
index f1e6dcb..726582b 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/gerrit_mock.py
+++ b/third_party/blink/tools/blinkpy/w3c/gerrit_mock.py
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-from webkitpy.w3c.gerrit import GerritCL
+from blinkpy.w3c.gerrit import GerritCL
# Some unused arguments may be included to match the real class's API.
# pylint: disable=unused-argument
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/gerrit_unittest.py b/third_party/blink/tools/blinkpy/w3c/gerrit_unittest.py
similarity index 95%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/gerrit_unittest.py
rename to third_party/blink/tools/blinkpy/w3c/gerrit_unittest.py
index 6a7ec58..dd12d5d5 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/gerrit_unittest.py
+++ b/third_party/blink/tools/blinkpy/w3c/gerrit_unittest.py
@@ -6,8 +6,8 @@
from webkitpy.common.host_mock import MockHost
from webkitpy.common.system.executive_mock import mock_git_commands
-from webkitpy.w3c.gerrit import GerritCL
-from webkitpy.w3c.gerrit_mock import MockGerritAPI
+from blinkpy.w3c.gerrit import GerritCL
+from blinkpy.w3c.gerrit_mock import MockGerritAPI
class GerritCLTest(unittest.TestCase):
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/import_notifier.py b/third_party/blink/tools/blinkpy/w3c/import_notifier.py
similarity index 98%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/import_notifier.py
rename to third_party/blink/tools/blinkpy/w3c/import_notifier.py
index 17de2ba..1cc78134 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/import_notifier.py
+++ b/third_party/blink/tools/blinkpy/w3c/import_notifier.py
@@ -17,9 +17,9 @@
import re
from webkitpy.common.path_finder import PathFinder
-from webkitpy.w3c.directory_owners_extractor import DirectoryOwnersExtractor
-from webkitpy.w3c.monorail import MonorailAPI, MonorailIssue
-from webkitpy.w3c.wpt_expectations_updater import UMBRELLA_BUG
+from blinkpy.w3c.directory_owners_extractor import DirectoryOwnersExtractor
+from blinkpy.w3c.monorail import MonorailAPI, MonorailIssue
+from blinkpy.w3c.wpt_expectations_updater import UMBRELLA_BUG
_log = logging.getLogger(__name__)
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/import_notifier_unittest.py b/third_party/blink/tools/blinkpy/w3c/import_notifier_unittest.py
similarity index 98%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/import_notifier_unittest.py
rename to third_party/blink/tools/blinkpy/w3c/import_notifier_unittest.py
index 73082cbc..0513db8f 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/import_notifier_unittest.py
+++ b/third_party/blink/tools/blinkpy/w3c/import_notifier_unittest.py
@@ -9,9 +9,9 @@
from webkitpy.common.host_mock import MockHost
from webkitpy.common.system.executive_mock import mock_git_commands
from webkitpy.common.system.filesystem_mock import MockFileSystem
-from webkitpy.w3c.local_wpt_mock import MockLocalWPT
-from webkitpy.w3c.import_notifier import ImportNotifier, TestFailure
-from webkitpy.w3c.wpt_expectations_updater import UMBRELLA_BUG
+from blinkpy.w3c.local_wpt_mock import MockLocalWPT
+from blinkpy.w3c.import_notifier import ImportNotifier, TestFailure
+from blinkpy.w3c.wpt_expectations_updater import UMBRELLA_BUG
class ImportNotifierTest(unittest.TestCase):
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/local_wpt.py b/third_party/blink/tools/blinkpy/w3c/local_wpt.py
similarity index 98%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/local_wpt.py
rename to third_party/blink/tools/blinkpy/w3c/local_wpt.py
index fad813af..6ed47237 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/local_wpt.py
+++ b/third_party/blink/tools/blinkpy/w3c/local_wpt.py
@@ -7,7 +7,7 @@
import logging
from webkitpy.common.system.executive import ScriptError
-from webkitpy.w3c.common import WPT_GH_SSH_URL_TEMPLATE, WPT_MIRROR_URL, CHROMIUM_WPT_DIR
+from blinkpy.w3c.common import WPT_GH_SSH_URL_TEMPLATE, WPT_MIRROR_URL, CHROMIUM_WPT_DIR
_log = logging.getLogger(__name__)
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/local_wpt_mock.py b/third_party/blink/tools/blinkpy/w3c/local_wpt_mock.py
similarity index 100%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/local_wpt_mock.py
rename to third_party/blink/tools/blinkpy/w3c/local_wpt_mock.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/local_wpt_unittest.py b/third_party/blink/tools/blinkpy/w3c/local_wpt_unittest.py
similarity index 98%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/local_wpt_unittest.py
rename to third_party/blink/tools/blinkpy/w3c/local_wpt_unittest.py
index 331628f..49d689b 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/local_wpt_unittest.py
+++ b/third_party/blink/tools/blinkpy/w3c/local_wpt_unittest.py
@@ -8,7 +8,7 @@
from webkitpy.common.system.executive import ScriptError
from webkitpy.common.system.executive_mock import MockExecutive, mock_git_commands
from webkitpy.common.system.filesystem_mock import MockFileSystem
-from webkitpy.w3c.local_wpt import LocalWPT
+from blinkpy.w3c.local_wpt import LocalWPT
class LocalWPTTest(unittest.TestCase):
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/monorail.py b/third_party/blink/tools/blinkpy/w3c/monorail.py
similarity index 100%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/monorail.py
rename to third_party/blink/tools/blinkpy/w3c/monorail.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/monorail_unittest.py b/third_party/blink/tools/blinkpy/w3c/monorail_unittest.py
similarity index 97%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/monorail_unittest.py
rename to third_party/blink/tools/blinkpy/w3c/monorail_unittest.py
index 91a35b18..b492731a 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/monorail_unittest.py
+++ b/third_party/blink/tools/blinkpy/w3c/monorail_unittest.py
@@ -4,7 +4,7 @@
import unittest
-from webkitpy.w3c.monorail import MonorailAPI, MonorailIssue
+from blinkpy.w3c.monorail import MonorailAPI, MonorailIssue
class MonorailIssueTest(unittest.TestCase):
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_copier.py b/third_party/blink/tools/blinkpy/w3c/test_copier.py
similarity index 99%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_copier.py
rename to third_party/blink/tools/blinkpy/w3c/test_copier.py
index 209550d..2c2a0cf 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_copier.py
+++ b/third_party/blink/tools/blinkpy/w3c/test_copier.py
@@ -35,7 +35,7 @@
from webkitpy.common.path_finder import PathFinder
from webkitpy.layout_tests.models.test_expectations import TestExpectationParser
-from webkitpy.w3c.common import is_basename_skipped
+from blinkpy.w3c.common import is_basename_skipped
_log = logging.getLogger(__name__)
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_copier_unittest.py b/third_party/blink/tools/blinkpy/w3c/test_copier_unittest.py
similarity index 98%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_copier_unittest.py
rename to third_party/blink/tools/blinkpy/w3c/test_copier_unittest.py
index e6aac52..c9882fb 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_copier_unittest.py
+++ b/third_party/blink/tools/blinkpy/w3c/test_copier_unittest.py
@@ -28,7 +28,7 @@
from webkitpy.common.host_mock import MockHost
from webkitpy.common.system.executive_mock import MockExecutive, ScriptError
from webkitpy.common.system.filesystem_mock import MockFileSystem
-from webkitpy.w3c.test_copier import TestCopier
+from blinkpy.w3c.test_copier import TestCopier
from webkitpy.common.system.log_testing import LoggingTestCase
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_exporter.py b/third_party/blink/tools/blinkpy/w3c/test_exporter.py
similarity index 97%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_exporter.py
rename to third_party/blink/tools/blinkpy/w3c/test_exporter.py
index 53aca97b..74dd00f3 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_exporter.py
+++ b/third_party/blink/tools/blinkpy/w3c/test_exporter.py
@@ -7,18 +7,18 @@
import argparse
import logging
-from webkitpy.common.system.log_utils import configure_logging
-from webkitpy.w3c.local_wpt import LocalWPT
-from webkitpy.w3c.chromium_exportable_commits import exportable_commits_over_last_n_commits
-from webkitpy.w3c.common import (
+from blinkpy.w3c.local_wpt import LocalWPT
+from blinkpy.w3c.chromium_exportable_commits import exportable_commits_over_last_n_commits
+from blinkpy.w3c.common import (
WPT_GH_URL,
WPT_REVISION_FOOTER,
EXPORT_PR_LABEL,
PROVISIONAL_PR_LABEL,
read_credentials
)
-from webkitpy.w3c.gerrit import GerritAPI, GerritCL, GerritError
-from webkitpy.w3c.wpt_github import WPTGitHub, MergeError
+from blinkpy.w3c.gerrit import GerritAPI, GerritCL, GerritError
+from blinkpy.w3c.wpt_github import WPTGitHub, MergeError
+from webkitpy.common.system.log_utils import configure_logging
_log = logging.getLogger(__name__)
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_exporter_unittest.py b/third_party/blink/tools/blinkpy/w3c/test_exporter_unittest.py
similarity index 97%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_exporter_unittest.py
rename to third_party/blink/tools/blinkpy/w3c/test_exporter_unittest.py
index 95d213bb..468bdf40 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_exporter_unittest.py
+++ b/third_party/blink/tools/blinkpy/w3c/test_exporter_unittest.py
@@ -6,12 +6,12 @@
from webkitpy.common.host_mock import MockHost
from webkitpy.common.system.log_testing import LoggingTestCase
-from webkitpy.w3c.chromium_commit_mock import MockChromiumCommit
-from webkitpy.w3c.gerrit import GerritError
-from webkitpy.w3c.gerrit_mock import MockGerritAPI, MockGerritCL
-from webkitpy.w3c.test_exporter import TestExporter
-from webkitpy.w3c.wpt_github import PullRequest
-from webkitpy.w3c.wpt_github_mock import MockWPTGitHub
+from blinkpy.w3c.chromium_commit_mock import MockChromiumCommit
+from blinkpy.w3c.gerrit import GerritError
+from blinkpy.w3c.gerrit_mock import MockGerritAPI, MockGerritCL
+from blinkpy.w3c.test_exporter import TestExporter
+from blinkpy.w3c.wpt_github import PullRequest
+from blinkpy.w3c.wpt_github_mock import MockWPTGitHub
class TestExporterTest(LoggingTestCase):
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py b/third_party/blink/tools/blinkpy/w3c/test_importer.py
similarity index 97%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py
rename to third_party/blink/tools/blinkpy/w3c/test_importer.py
index a165da67..4f010151 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py
+++ b/third_party/blink/tools/blinkpy/w3c/test_importer.py
@@ -23,15 +23,15 @@
from webkitpy.common.system.log_utils import configure_logging
from webkitpy.layout_tests.models.test_expectations import TestExpectations, TestExpectationParser
from webkitpy.layout_tests.port.base import Port
-from webkitpy.w3c.chromium_exportable_commits import exportable_commits_over_last_n_commits
-from webkitpy.w3c.common import read_credentials, is_testharness_baseline, is_file_exportable
-from webkitpy.w3c.directory_owners_extractor import DirectoryOwnersExtractor
-from webkitpy.w3c.import_notifier import ImportNotifier
-from webkitpy.w3c.local_wpt import LocalWPT
-from webkitpy.w3c.test_copier import TestCopier
-from webkitpy.w3c.wpt_expectations_updater import WPTExpectationsUpdater
-from webkitpy.w3c.wpt_github import WPTGitHub
-from webkitpy.w3c.wpt_manifest import WPTManifest
+from blinkpy.w3c.chromium_exportable_commits import exportable_commits_over_last_n_commits
+from blinkpy.w3c.common import read_credentials, is_testharness_baseline, is_file_exportable
+from blinkpy.w3c.directory_owners_extractor import DirectoryOwnersExtractor
+from blinkpy.w3c.import_notifier import ImportNotifier
+from blinkpy.w3c.local_wpt import LocalWPT
+from blinkpy.w3c.test_copier import TestCopier
+from blinkpy.w3c.wpt_expectations_updater import WPTExpectationsUpdater
+from blinkpy.w3c.wpt_github import WPTGitHub
+from blinkpy.w3c.wpt_manifest import WPTManifest
# Settings for how often to check try job results and how long to wait.
POLL_DELAY_SECONDS = 2 * 60
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py b/third_party/blink/tools/blinkpy/w3c/test_importer_unittest.py
similarity index 98%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py
rename to third_party/blink/tools/blinkpy/w3c/test_importer_unittest.py
index 55f2242d..606c1ad 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py
+++ b/third_party/blink/tools/blinkpy/w3c/test_importer_unittest.py
@@ -15,11 +15,11 @@
from webkitpy.common.system.executive_mock import MockExecutive
from webkitpy.common.system.log_testing import LoggingTestCase
from webkitpy.layout_tests.builder_list import BuilderList
-from webkitpy.w3c.chromium_commit_mock import MockChromiumCommit
-from webkitpy.w3c.local_wpt import LocalWPT
-from webkitpy.w3c.local_wpt_mock import MockLocalWPT
-from webkitpy.w3c.test_importer import TestImporter, ROTATIONS_URL, TBR_FALLBACK
-from webkitpy.w3c.wpt_github_mock import MockWPTGitHub
+from blinkpy.w3c.chromium_commit_mock import MockChromiumCommit
+from blinkpy.w3c.local_wpt import LocalWPT
+from blinkpy.w3c.local_wpt_mock import MockLocalWPT
+from blinkpy.w3c.test_importer import TestImporter, ROTATIONS_URL, TBR_FALLBACK
+from blinkpy.w3c.wpt_github_mock import MockWPTGitHub
class TestImporterTest(LoggingTestCase):
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_expectations_updater.py b/third_party/blink/tools/blinkpy/w3c/wpt_expectations_updater.py
similarity index 99%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_expectations_updater.py
rename to third_party/blink/tools/blinkpy/w3c/wpt_expectations_updater.py
index ca7245d..d87feba 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_expectations_updater.py
+++ b/third_party/blink/tools/blinkpy/w3c/wpt_expectations_updater.py
@@ -19,7 +19,7 @@
from webkitpy.common.path_finder import PathFinder
from webkitpy.common.system.executive import ScriptError
from webkitpy.common.system.log_utils import configure_logging
-from webkitpy.w3c.wpt_manifest import WPTManifest
+from blinkpy.w3c.wpt_manifest import WPTManifest
_log = logging.getLogger(__name__)
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_expectations_updater_unittest.py b/third_party/blink/tools/blinkpy/w3c/wpt_expectations_updater_unittest.py
similarity index 99%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_expectations_updater_unittest.py
rename to third_party/blink/tools/blinkpy/w3c/wpt_expectations_updater_unittest.py
index 7c580f83..f0ac72a 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_expectations_updater_unittest.py
+++ b/third_party/blink/tools/blinkpy/w3c/wpt_expectations_updater_unittest.py
@@ -15,7 +15,7 @@
from webkitpy.common.system.log_testing import LoggingTestCase
from webkitpy.layout_tests.builder_list import BuilderList
from webkitpy.layout_tests.port.factory_mock import MockPortFactory
-from webkitpy.w3c.wpt_expectations_updater import WPTExpectationsUpdater, SimpleTestResult, MARKER_COMMENT
+from blinkpy.w3c.wpt_expectations_updater import WPTExpectationsUpdater, SimpleTestResult, MARKER_COMMENT
class WPTExpectationsUpdaterTest(LoggingTestCase):
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github.py b/third_party/blink/tools/blinkpy/w3c/wpt_github.py
similarity index 99%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github.py
rename to third_party/blink/tools/blinkpy/w3c/wpt_github.py
index 7ee32c6..e5bcc0b 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github.py
+++ b/third_party/blink/tools/blinkpy/w3c/wpt_github.py
@@ -10,7 +10,7 @@
from collections import namedtuple
from webkitpy.common.memoized import memoized
-from webkitpy.w3c.common import WPT_GH_ORG, WPT_GH_REPO_NAME, EXPORT_PR_LABEL
+from blinkpy.w3c.common import WPT_GH_ORG, WPT_GH_REPO_NAME, EXPORT_PR_LABEL
_log = logging.getLogger(__name__)
API_BASE = 'https://api.github.com'
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github_mock.py b/third_party/blink/tools/blinkpy/w3c/wpt_github_mock.py
similarity index 97%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github_mock.py
rename to third_party/blink/tools/blinkpy/w3c/wpt_github_mock.py
index 26e7d148..fd98568 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github_mock.py
+++ b/third_party/blink/tools/blinkpy/w3c/wpt_github_mock.py
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-from webkitpy.w3c.wpt_github import MergeError, WPTGitHub
+from blinkpy.w3c.wpt_github import MergeError, WPTGitHub
class MockWPTGitHub(object):
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github_unittest.py b/third_party/blink/tools/blinkpy/w3c/wpt_github_unittest.py
similarity index 97%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github_unittest.py
rename to third_party/blink/tools/blinkpy/w3c/wpt_github_unittest.py
index 7414c6c2..c06f710b 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github_unittest.py
+++ b/third_party/blink/tools/blinkpy/w3c/wpt_github_unittest.py
@@ -7,9 +7,9 @@
import unittest
from webkitpy.common.host_mock import MockHost
-from webkitpy.w3c.chromium_commit_mock import MockChromiumCommit
-from webkitpy.w3c.common import EXPORT_PR_LABEL
-from webkitpy.w3c.wpt_github import MAX_PR_HISTORY_WINDOW, GitHubError, MergeError, PullRequest, WPTGitHub
+from blinkpy.w3c.chromium_commit_mock import MockChromiumCommit
+from blinkpy.w3c.common import EXPORT_PR_LABEL
+from blinkpy.w3c.wpt_github import MAX_PR_HISTORY_WINDOW, GitHubError, MergeError, PullRequest, WPTGitHub
class WPTGitHubTest(unittest.TestCase):
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_manifest.py b/third_party/blink/tools/blinkpy/w3c/wpt_manifest.py
similarity index 100%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_manifest.py
rename to third_party/blink/tools/blinkpy/w3c/wpt_manifest.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_manifest_unittest.py b/third_party/blink/tools/blinkpy/w3c/wpt_manifest_unittest.py
similarity index 97%
rename from third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_manifest_unittest.py
rename to third_party/blink/tools/blinkpy/w3c/wpt_manifest_unittest.py
index 201f0cc0..74e02f9 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_manifest_unittest.py
+++ b/third_party/blink/tools/blinkpy/w3c/wpt_manifest_unittest.py
@@ -7,7 +7,7 @@
from webkitpy.common.host_mock import MockHost
from webkitpy.common.system.executive import ScriptError
from webkitpy.common.system.executive_mock import MockExecutive
-from webkitpy.w3c.wpt_manifest import WPTManifest
+from blinkpy.w3c.wpt_manifest import WPTManifest
class WPTManifestUnitTest(unittest.TestCase):
diff --git a/third_party/blink/tools/wpt_export.py b/third_party/blink/tools/wpt_export.py
index 326ec867..83836755 100755
--- a/third_party/blink/tools/wpt_export.py
+++ b/third_party/blink/tools/wpt_export.py
@@ -8,14 +8,10 @@
import os
import sys
-# Without abspath(), PathFinder can't find chromium_base correctly.
-sys.path.append(os.path.abspath(
- os.path.join(os.path.dirname(__file__), '..', '..',
- 'WebKit', 'Tools', 'Scripts')))
+from blinkpy.common import add_webkitpy # pylint: disable=unused-import
from webkitpy.common import exit_codes
from webkitpy.common.host import Host
-
-from webkitpy.w3c.test_exporter import TestExporter
+from blinkpy.w3c.test_exporter import TestExporter
def main():
diff --git a/third_party/blink/tools/wpt_import.py b/third_party/blink/tools/wpt_import.py
index b833be2..da4c0db 100755
--- a/third_party/blink/tools/wpt_import.py
+++ b/third_party/blink/tools/wpt_import.py
@@ -8,13 +8,10 @@
import os
import sys
-# Without abspath(), PathFinder can't find chromium_base correctly.
-sys.path.append(os.path.abspath(
- os.path.join(os.path.dirname(__file__), '..', '..',
- 'WebKit', 'Tools', 'Scripts')))
+from blinkpy.common import add_webkitpy # pylint: disable=unused-import
from webkitpy.common import exit_codes
from webkitpy.common.host import Host
-from webkitpy.w3c.test_importer import TestImporter
+from blinkpy.w3c.test_importer import TestImporter
def main():
diff --git a/third_party/blink/tools/wpt_update_expectations.py b/third_party/blink/tools/wpt_update_expectations.py
index 5b507ed..19900d1 100755
--- a/third_party/blink/tools/wpt_update_expectations.py
+++ b/third_party/blink/tools/wpt_update_expectations.py
@@ -7,7 +7,7 @@
from blinkpy.common import add_webkitpy # pylint: disable=unused-import
from webkitpy.common import host
-from webkitpy.w3c.wpt_expectations_updater import WPTExpectationsUpdater
+from blinkpy.w3c.wpt_expectations_updater import WPTExpectationsUpdater
if __name__ == "__main__":
