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 <thakis@chromium.org>
Reviewed-by: Quinten Yearsley <qyearsley@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551919}

BUILD.gn

@@ -960,6 +960,7 @@ if (!is_ios) {
       "//third_party/WebKit/LayoutTests/",
       "//third_party/WebKit/Tools/Scripts/",
       "//third_party/blink/perf_tests/",
+      "//third_party/blink/tools/",
       "//third_party/pywebsocket/",
     ]
 

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')))

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py

@@ -43,6 +43,7 @@ import random
 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_failures
 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__)
 

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/lint_test_expectations.py

@@ -31,12 +31,13 @@ import logging
 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__)
 

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py

@@ -42,6 +42,7 @@ import re
 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.port.factory import PortFactory
 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__)
 

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_cl.py

@@ -8,11 +8,12 @@ import json
 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__)

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
 
 

third_party/blink/tools/blinkpy/w3c/chromium_commit_unittest.py

@@ -7,7 +7,7 @@ import unittest
 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/'
 

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

third_party/blink/tools/blinkpy/w3c/chromium_exportable_commits_unittest.py

@@ -6,16 +6,16 @@ import unittest
 
 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):

third_party/blink/tools/blinkpy/w3c/common_unittest.py

@@ -6,7 +6,7 @@ import json
 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,

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'

third_party/blink/tools/blinkpy/w3c/gerrit.py

@@ -8,9 +8,9 @@ import logging
 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'

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

third_party/blink/tools/blinkpy/w3c/gerrit_unittest.py

@@ -6,8 +6,8 @@ import unittest
 
 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):

third_party/blink/tools/blinkpy/w3c/import_notifier.py

@@ -17,9 +17,9 @@ import logging
 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__)
 

third_party/blink/tools/blinkpy/w3c/import_notifier_unittest.py

@@ -9,9 +9,9 @@ from webkitpy.common.checkout.git_mock import MockGit
 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):

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__)
 

third_party/blink/tools/blinkpy/w3c/local_wpt_unittest.py

@@ -8,7 +8,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.common.system.filesystem_mock import MockFileSystem
-from webkitpy.w3c.local_wpt import LocalWPT
+from blinkpy.w3c.local_wpt import LocalWPT
 
 
 class LocalWPTTest(unittest.TestCase):

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):

third_party/blink/tools/blinkpy/w3c/test_copier.py

@@ -35,7 +35,7 @@ import logging
 
 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__)
 

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
 
 

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__)
 

third_party/blink/tools/blinkpy/w3c/test_exporter_unittest.py

@@ -6,12 +6,12 @@ import json
 
 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):

third_party/blink/tools/blinkpy/w3c/test_importer.py

@@ -23,15 +23,15 @@ from webkitpy.common.path_finder import PathFinder
 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

third_party/blink/tools/blinkpy/w3c/test_importer_unittest.py

@@ -15,11 +15,11 @@ from webkitpy.common.system.executive_mock import MockCall
 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):

third_party/blink/tools/blinkpy/w3c/wpt_expectations_updater.py

@@ -19,7 +19,7 @@ from webkitpy.common.net.git_cl import GitCL
 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__)
 

third_party/blink/tools/blinkpy/w3c/wpt_expectations_updater_unittest.py

@@ -15,7 +15,7 @@ from webkitpy.common.system.executive import ScriptError
 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):

third_party/blink/tools/blinkpy/w3c/wpt_github.py

@@ -10,7 +10,7 @@ import urllib2
 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'

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):

third_party/blink/tools/blinkpy/w3c/wpt_github_unittest.py

@@ -7,9 +7,9 @@ import json
 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):

third_party/blink/tools/blinkpy/w3c/wpt_manifest_unittest.py

@@ -7,7 +7,7 @@ import unittest
 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):

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():

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():

third_party/blink/tools/wpt_update_expectations.py

@@ -7,7 +7,7 @@ import sys
 
 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__":