Delete webkit directory on initial sync as well.

tools/bisect_utils.py

 # 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.
 
 """Set of operations/utilities related to checking out the depot, and
 outputting annotations on the buildbot waterfall. These are intended to be
 used by the bisection scripts."""
 
 import errno
 import os
+import shutil
 import subprocess
 
 
 GCLIENT_SPEC = """
 solutions = [
   { "name"        : "src",
     "url"         : "https://chromium.googlesource.com/chromium/src.git",
     "deps_file"   : ".DEPS.git",
     "managed"     : True,
     "custom_deps" : {
       "src/data/page_cycler": "https://chrome-internal.googlesource.com/" +
                               "chrome/data/page_cycler/.git",
       "src/tools/perf/data": "https://chrome-internal.googlesource.com/" +
                              "chrome/tools/perf/data/.git",
       "src/v8_bleeding_edge": "git://github.com/v8/v8.git",
     },
     "safesync_url": "",
   },
 ]
 """
 GCLIENT_SPEC = ''.join([l for l in GCLIENT_SPEC.splitlines()])
+FILE_DEPS_GIT = '.DEPS.git'
 
 
 def OutputAnnotationStepStart(name):
   """Outputs appropriate annotation to signal the start of a step to
   a trybot.
 
   Args:
     name: The name of the step.
   """
   print
@@ skipping 54 matching lines @@
   """Runs gclient and creates a config containing both src and src-internal.
 
   Returns:
     The return code of the call.
   """
   return_code = RunGClient(
       ['config', '--spec=%s' % GCLIENT_SPEC, '--git-deps'])
   return return_code
 
 
+def IsDepsFileBlink():
+  """Reads .DEPS.git and returns whether or not we're using blink.
+
+  Returns:
+    True if blink, false if webkit.
+  """
+  locals = {'Var': lambda _: locals["vars"][_],
+            'From': lambda *args: None}
+  execfile(FILE_DEPS_GIT, {}, locals)
+  return 'blink.git' in locals['vars']['webkit_url']
+
+
+def RemoveThirdPartyWebkitDirectory():
+  """Removes third_party/WebKit.
+
+  Returns:
+    True on success.
+  """
+  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 True
+
+
 def RunGClientAndSync(reset):
   """Runs gclient and does a normal sync.
 
   Args:
     reset: Whether to reset any changes to the depot.
 
   Returns:
     The return code of the call.
   """
   params = ['sync', '--verbose']
@@ skipping 14 matching lines @@
     otherwise.
   """
   name = 'Setting up Bisection Depot'
 
   if output_buildbot_annotations:
     OutputAnnotationStepStart(name)
 
   passed = False
 
   if not RunGClientAndCreateConfig():
-    if not RunGClientAndSync(reset):
+    passed_deps_check = True
+    if os.path.isfile(os.path.join('src', FILE_DEPS_GIT)):
+      cwd = os.getcwd()
+      os.chdir('src')
+      if not IsDepsFileBlink():
+        passed_deps_check = RemoveThirdPartyWebkitDirectory()
+      else:
+        passed_deps_check = True
+      os.chdir(cwd)
+
+    if passed_deps_check and not RunGClientAndSync(reset):
       passed = True
 
   if output_buildbot_annotations:
     print
     OutputAnnotationStepClosed()
 
   return passed
 
 
 def CreateBisectDirectoryAndSetupDepot(opts, reset=False):
@@ skipping 11 matching lines @@
     print 'Error: Could not create bisect directory.'
     print
     return 1
 
   if not SetupGitDepot(opts.output_buildbot_annotations, reset):
     print 'Error: Failed to grab source.'
     print
     return 1
 
   return 0