Refactoring and minor corrections:

tools/auto_bisect/bisect_utils.py

 # Copyright 2014 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.
 
 """Utility functions used by the bisect tool.
 
 This includes functions related to checking out the depot and outputting
 annotations for the Buildbot waterfall.
 """
 
 import errno
 import imp
+import json
 import os
 import shutil
 import stat
 import subprocess
 import sys
 
 DEFAULT_GCLIENT_CUSTOM_DEPS = {
     'src/data/page_cycler': 'https://chrome-internal.googlesource.com/'
                             'chrome/data/page_cycler/.git',
     'src/data/dom_perf': 'https://chrome-internal.googlesource.com/'
@@ skipping 244 matching lines @@
   Returns:
     The return code of the call.
   """
   spec = GCLIENT_SPEC_DATA
 
   if custom_deps:
     for k, v in custom_deps.iteritems():
       spec[0]['custom_deps'][k] = v
 
   # Cannot have newlines in string on windows
-  spec = 'solutions =' + str(spec)
-  spec = ''.join([l for l in spec.splitlines()])
-
+  spec = 'solutions=' + json.dumps(spec)

[qyearsley, 2014/09/15 20:30:40]

Is the spec interpreted as Python or JSON?

Most JSON is also valid Python, unless it contains the value true, false, or
null.

=>>> json.dumps({'managed': True})
=> '{"managed": true}'

[Sergiy Byelozyorov, 2014/09/16 11:24:42]

Does gclient interpret this as Python via eval? I would think using json.load is
a lot safer.

[qyearsley, 2014/09/16 18:59:18]

Yeah, I think that gclient interprets it as Python using exec.
https://code.google.com/p/chromium/codesearch#chromium/tools/depot_tools/gcli...

I also think that JSON would be better, but given how gclient behaves, I suppose
this must still be given as Python without newlines here.

[Sergiy Byelozyorov, 2014/09/17 15:45:18]

Done.

   if 'android' in opts.target_platform:
     spec += GCLIENT_SPEC_ANDROID
 
   return_code = RunGClient(
       ['config', '--spec=%s' % spec], cwd=cwd)
   return return_code
 
 
 
 def OnAccessError(func, path, _):
@@ skipping 82 matching lines @@
   if opts.output_buildbot_annotations:
     OutputAnnotationStepStart(name)
 
   passed = False
 
   if not RunGClientAndCreateConfig(opts, custom_deps):
     passed_deps_check = True
     if os.path.isfile(os.path.join('src', FILE_DEPS_GIT)):
       cwd = os.getcwd()
       os.chdir('src')
-      passed_deps_check = True
       if passed_deps_check:
         passed_deps_check = RemoveThirdPartyDirectory('libjingle')
       if passed_deps_check:
         passed_deps_check = RemoveThirdPartyDirectory('skia')
       os.chdir(cwd)
 
     if passed_deps_check:
       _CleanupPreviousGitRuns()
 
       RunGClient(['revert'])
@@ skipping 181 matching lines @@
   return sys.platform.startswith('linux')
 
 
 def IsMacHost():
   """Checks whether or not the script is running on Mac.
 
   Returns:
     True if running on Mac.
   """
   return sys.platform.startswith('darwin')