Delete webkit directory on initial sync as well.

tools/bisect-perf-regression.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 """Performance Test Bisect Tool
 
 This script bisects a series of changelists using binary search. It starts at
 a bad revision where a performance metric has regressed, and asks for a last
 known-good revision. It will then binary search across this revision range by
@@ skipping 83 matching lines @@
   'skia/gyp' : {
     "src" : "src/third_party/skia/gyp",
     "recurse" : False,
     "svn" : "http://skia.googlecode.com/svn/trunk/gyp",
     "depends" : None
   }
 }
 
 DEPOT_NAMES = DEPOT_DEPS_NAME.keys()
 
-FILE_DEPS_GIT = '.DEPS.git'
 
 
 def CalculateTruncatedMean(data_set, truncate_percent):
   """Calculates the truncated mean of a set of values.
 
   Args:
     data_set: Set of values to use in calculation.
     truncate_percent: The % from the upper/lower portions of the data set to
         discard, expressed as a value in [0, 1].
 
@@ skipping 369 matching lines @@
     """
     return not RunGit(['checkout', revision, file_name])[1]
 
   def RevertFileToHead(self, file_name):
     """Unstages a file and returns it to HEAD.
 
     Returns:
       True if successful.
     """
     # Reset doesn't seem to return 0 on success.
-    RunGit(['reset', 'HEAD', FILE_DEPS_GIT])
+    RunGit(['reset', 'HEAD', bisect_utils.FILE_DEPS_GIT])
 
-    return not RunGit(['checkout', FILE_DEPS_GIT])[1]
+    return not RunGit(['checkout', bisect_utils.FILE_DEPS_GIT])[1]
 
 class BisectPerformanceMetrics(object):
   """BisectPerformanceMetrics performs a bisection against a list of range
   of revisions to narrow down where performance regressions may have
   occurred."""
 
   def __init__(self, source_control, opts):
     super(BisectPerformanceMetrics, self).__init__()
 
     self.opts = opts
@@ skipping 34 matching lines @@
 
     Returns:
       A dict in the format {depot:revision} if successful, otherwise None.
     """
 
     cwd = os.getcwd()
     os.chdir(self.src_cwd)
 
     locals = {'Var': lambda _: locals["vars"][_],
               'From': lambda *args: None}
-    execfile(FILE_DEPS_GIT, {}, locals)
+    execfile(bisect_utils.FILE_DEPS_GIT, {}, locals)
 
     os.chdir(cwd)
 
     results = {}
 
     rxp = re.compile(".git@(?P<revision>[a-fA-F0-9]+)")
 
     for d in DEPOT_NAMES:
       if DEPOT_DEPS_NAME[d]['recurse']:
         if locals['deps'].has_key(DEPOT_DEPS_NAME[d]['src']):
@@ skipping 226 matching lines @@
 
   def PerformWebkitDirectoryCleanup(self, revision):
     """If the script is switching between Blink and WebKit during bisect,
     its faster to just delete the directory rather than leave it up to git
     to sync.
 
     Returns:
       True if successful.
     """
     if not self.source_control.CheckoutFileAtRevision(
-        FILE_DEPS_GIT, revision):
+        bisect_utils.FILE_DEPS_GIT, revision):
       return False
 
     cwd = os.getcwd()
     os.chdir(self.src_cwd)
 
-    locals = {'Var': lambda _: locals["vars"][_],
-              'From': lambda *args: None}
-    execfile(FILE_DEPS_GIT, {}, locals)
+    is_blink = bisect_utils.IsDepsFileBlink()
 
     os.chdir(cwd)
 
-    is_blink = 'blink.git' in locals['vars']['webkit_url']
-
-    if not self.source_control.RevertFileToHead(FILE_DEPS_GIT):
+    if not self.source_control.RevertFileToHead(
+        bisect_utils.FILE_DEPS_GIT):
       return False
 
     if self.was_blink != is_blink:
       self.was_blink = is_blink
-      try:
-        path_to_dir = os.path.join(os.getcwd(), 'third_party', 'WebKit')
-        if os.path.exists(path_to_dir):
-          shutil.rmtree(path_to_dir)
-      except OSError, e:
-        if e.errno != errno.ENOENT:
-          return False
+      return bisect_utils.RemoveThirdPartyWebkitDirectory()
     return True
 
   def PerformPreSyncCleanup(self, revision, depot):
     """Performs any necessary cleanup before syncing.
 
     Returns:
       True if successful.
     """
     if depot == 'chromium':
       return self.PerformWebkitDirectoryCleanup(revision)
@@ skipping 904 matching lines @@
 
   if not(bisect_results['error']):
     return 0
   else:
     print 'Error: ' + bisect_results['error']
     print
     return 1
 
 if __name__ == '__main__':
   sys.exit(main())