[WPT Export] Use github remote, not origin

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

 # Copyright 2016 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.
 
 """A utility class for interacting with a local checkout of the Web Platform Tests."""
 
 import logging
 
 from webkitpy.common.system.executive import ScriptError
 from webkitpy.w3c.chromium_commit import ChromiumCommit
-from webkitpy.w3c.common import WPT_REPO_URL, CHROMIUM_WPT_DIR
+from webkitpy.w3c.common import WPT_GH_REPO_URL, CHROMIUM_WPT_DIR
 
 
-WPT_SSH_URL = 'git@github.com:w3c/web-platform-tests.git'
-REMOTE_NAME = 'github'
-
 _log = logging.getLogger(__name__)
 
 
 class LocalWPT(object):
 
     def __init__(self, host, path='/tmp/wpt'):
         """
         Args:
             host: A Host object.
             path: Optional, the path to the web-platform-tests repo.
                 If this directory already exists, it is assumed that the
                 web-platform-tests repo is already checked out at this path.
         """
         self.host = host
         self.path = path
         self.branch_name = 'chromium-export-try'
 
     def fetch(self):
         if self.host.filesystem.exists(self.path):
             _log.info('WPT checkout exists at %s, fetching latest', self.path)
-            self.run(['git', 'fetch', '--all'])
+            self.run(['git', 'fetch', 'origin'])
             self.run(['git', 'checkout', 'origin/master'])
         else:
-            _log.info('Cloning %s into %s', WPT_REPO_URL, self.path)
-            self.host.executive.run_command(['git', 'clone', WPT_REPO_URL, self.path])
-
-        if REMOTE_NAME not in self.run(['git', 'remote']):
-            self.run(['git', 'remote', 'add', REMOTE_NAME, WPT_SSH_URL])
+            _log.info('Cloning %s into %s', WPT_GH_REPO_URL, self.path)
+            self.host.executive.run_command(['git', 'clone', WPT_GH_REPO_URL, self.path])
 
     def run(self, command, **kwargs):
         """Runs a command in the local WPT directory."""
         return self.host.executive.run_command(command, cwd=self.path, **kwargs)
 
     def most_recent_chromium_commit(self):
         """Finds the most recent commit in WPT with a Chromium commit position."""
         wpt_commit_hash = self.run(['git', 'rev-list', 'HEAD', '-n', '1', '--grep=Cr-Commit-Position'])
         if not wpt_commit_hash:
             return None, None
@@ skipping 35 matching lines @@
         self.run(['git', 'checkout', '-b', self.branch_name])
 
         # Remove Chromium WPT directory prefix.
         patch = patch.replace(CHROMIUM_WPT_DIR, '')
 
         # TODO(jeffcarp): Use git am -p<n> where n is len(CHROMIUM_WPT_DIR.split(/'))
         # or something not off-by-one.
         self.run(['git', 'apply', '-'], input=patch)
         self.run(['git', 'add', '.'])
         self.run(['git', 'commit', '--author', author, '-am', message])
-        self.run(['git', 'push', '-f', REMOTE_NAME, self.branch_name])
+        self.run(['git', 'push', '-f', 'origin', self.branch_name])
 
         return self.branch_name
 
     def test_patch(self, patch, chromium_commit=None):
         """Returns the expected output of a patch against origin/master.
 
         Args:
             patch: The patch to test against.
 
         Returns:
@@ skipping 20 matching lines @@
 
     def commits_behind_master(self, commit):
         """Returns the number of commits after the given commit on origin/master.
 
         This doesn't include the given commit, and this assumes that the given
         commit is on the the master branch.
         """
         return len(self.run([
             'git', 'rev-list', '{}..origin/master'.format(commit)
         ]).splitlines())