Rename WebKitFinder -> BlinkFinder.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py
index be88f0b1400fa7ba871f66209aeda51f0bbf0572..63cad1abce2b5d7a092a0a9f3e78a0623f746aa8 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py
@@ -14,7 +14,7 @@ import argparse
 import json
 
 from webkitpy.common.net.git_cl import GitCL
-from webkitpy.common.webkit_finder import WebKitFinder
+from webkitpy.common.blink_finder import BlinkFinder
 from webkitpy.layout_tests.models.test_expectations import TestExpectations, TestExpectationParser
 
 # Import destination directories (under LayoutTests/imported/).
@@ -35,7 +35,7 @@ class DepsUpdater(object):
         self.host = host
         self.executive = host.executive
         self.fs = host.filesystem
-        self.finder = WebKitFinder(self.fs)
+        self.finder = BlinkFinder(self.fs)
         self.verbose = False
         self.git_cl = None
 
@@ -99,11 +99,11 @@ class DepsUpdater(object):
             _log.warning('Checkout has local commits; aborting. Use --allow-local-commits to allow this.')
             return False
 
-        if self.fs.exists(self.path_from_webkit_base(WPT_DEST_NAME)):
+        if self.fs.exists(self.path_from_blink_base(WPT_DEST_NAME)):
             _log.warning('WebKit/%s exists; aborting.', WPT_DEST_NAME)
             return False
 
-        if self.fs.exists(self.path_from_webkit_base(CSS_DEST_NAME)):
+        if self.fs.exists(self.path_from_blink_base(CSS_DEST_NAME)):
             _log.warning('WebKit/%s repo exists; aborting.', CSS_DEST_NAME)
             return False
 
@@ -138,13 +138,13 @@ class DepsUpdater(object):
             ('testharness.js', 'resources'),
         ]
         for filename, wpt_subdir in resources_to_copy_to_wpt:
-            source = self.path_from_webkit_base('LayoutTests', 'resources', filename)
-            destination = self.path_from_webkit_base('LayoutTests', 'imported', WPT_DEST_NAME, wpt_subdir, filename)
+            source = self.path_from_blink_base('LayoutTests', 'resources', filename)
+            destination = self.path_from_blink_base('LayoutTests', 'imported', WPT_DEST_NAME, wpt_subdir, filename)
             self.copyfile(source, destination)
             self.run(['git', 'add', destination])
         for filename, wpt_subdir in resources_to_copy_from_wpt:
-            source = self.path_from_webkit_base('LayoutTests', 'imported', WPT_DEST_NAME, wpt_subdir, filename)
-            destination = self.path_from_webkit_base('LayoutTests', 'resources', filename)
+            source = self.path_from_blink_base('LayoutTests', 'imported', WPT_DEST_NAME, wpt_subdir, filename)
+            destination = self.path_from_blink_base('LayoutTests', 'resources', filename)
             self.copyfile(source, destination)
             self.run(['git', 'add', destination])
 
@@ -173,7 +173,7 @@ class DepsUpdater(object):
         Returns:
             A string for the commit description "<destination>@<commitish>".
         """
-        temp_repo_path = self.path_from_webkit_base(dest_dir_name)
+        temp_repo_path = self.path_from_blink_base(dest_dir_name)
         _log.info('Cloning %s into %s.', url, temp_repo_path)
         self.run(['git', 'clone', url, temp_repo_path])
 
@@ -187,14 +187,14 @@ class DepsUpdater(object):
         master_commitish = show_ref_output.split()[0]
 
         _log.info('Cleaning out tests from LayoutTests/imported/%s.', dest_dir_name)
-        dest_path = self.path_from_webkit_base('LayoutTests', 'imported', dest_dir_name)
+        dest_path = self.path_from_blink_base('LayoutTests', 'imported', dest_dir_name)
         files_to_delete = self.fs.files_under(dest_path, file_filter=self.is_not_baseline)
         for subpath in files_to_delete:
             self.remove('LayoutTests', 'imported', subpath)
 
         _log.info('Importing the tests.')
-        src_repo = self.path_from_webkit_base(dest_dir_name)
-        import_path = self.path_from_webkit_base('Tools', 'Scripts', 'import-w3c-tests')
+        src_repo = self.path_from_blink_base(dest_dir_name)
+        import_path = self.path_from_blink_base('Tools', 'Scripts', 'import-w3c-tests')
         self.run([self.host.executable, import_path, '-d', 'imported', src_repo])
 
         self.run(['git', 'add', '--all', 'LayoutTests/imported/%s' % dest_dir_name])
@@ -223,7 +223,7 @@ class DepsUpdater(object):
                           '\n'
                           'Using update-w3c-deps in Chromium %s.\n'
                           % (import_commitish, chromium_commitish))
-            path_to_commit_msg = self.path_from_webkit_base('commit_msg')
+            path_to_commit_msg = self.path_from_blink_base('commit_msg')
             _log.debug('cat > %s <<EOF', path_to_commit_msg)
             _log.debug(commit_msg)
             _log.debug('EOF')
@@ -246,7 +246,7 @@ class DepsUpdater(object):
     def run(self, cmd, exit_on_failure=True, cwd=None):
         _log.debug('Running command: %s', ' '.join(cmd))
 
-        cwd = cwd or self.finder.webkit_base()
+        cwd = cwd or self.finder.blink_base()
         proc = self.executive.popen(cmd, stdout=self.executive.PIPE, stderr=self.executive.PIPE, cwd=cwd)
         out, err = proc.communicate()
         if proc.returncode or self.verbose:
@@ -272,17 +272,17 @@ class DepsUpdater(object):
         self.fs.copyfile(source, destination)
 
     def remove(self, *comps):
-        dest = self.path_from_webkit_base(*comps)
+        dest = self.path_from_blink_base(*comps)
         _log.debug('rm %s', dest)
         self.fs.remove(dest)
 
     def rmtree(self, *comps):
-        dest = self.path_from_webkit_base(*comps)
+        dest = self.path_from_blink_base(*comps)
         _log.debug('rm -fr %s', dest)
         self.fs.rmtree(dest)
 
-    def path_from_webkit_base(self, *comps):
-        return self.finder.path_from_webkit_base(*comps)
+    def path_from_blink_base(self, *comps):
+        return self.finder.path_from_blink_base(*comps)
 
     def do_auto_update(self):
         """Attempts to upload a CL, make any required adjustments, and commit.
@@ -339,7 +339,7 @@ class DepsUpdater(object):
     def get_directory_owners_to_cc(self):
         """Returns a list of email addresses to CC for the current import."""
         _log.info('Gathering directory owners emails to CC.')
-        directory_owners_file_path = self.finder.path_from_webkit_base(
+        directory_owners_file_path = self.finder.path_from_blink_base(
             'Tools', 'Scripts', 'webkitpy', 'w3c', 'directory_owners.json')
         with open(directory_owners_file_path) as data_file:
             directory_to_owner = self.parse_directory_owners(json.load(data_file))
@@ -379,7 +379,7 @@ class DepsUpdater(object):
     def fetch_new_expectations_and_baselines(self):
         """Adds new expectations and downloads baselines based on try job results, then commits and uploads the change."""
         _log.info('Adding test expectations lines to LayoutTests/TestExpectations.')
-        script_path = self.path_from_webkit_base('Tools', 'Scripts', 'update-w3c-test-expectations')
+        script_path = self.path_from_blink_base('Tools', 'Scripts', 'update-w3c-test-expectations')
         self.run([self.host.executable, script_path, '--verbose'])
         message = 'Modify TestExpectations or download new baselines for tests.'
         self.check_run(['git', 'commit', '-a', '-m', message])