Re-re-land gclient deletion of mismatching checkouts again

tests/gclient_utils_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 import os
 import StringIO
 import sys
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
@@ skipping 11 matching lines @@
     gclient_utils.sys.stdout.flush = lambda: None
     self.mox.StubOutWithMock(subprocess2, 'Popen')
     self.mox.StubOutWithMock(subprocess2, 'communicate')
 
 
 class GclientUtilsUnittest(GclientUtilBase):
   """General gclient_utils.py tests."""
   def testMembersChanged(self):
     members = [
         'Annotated', 'AutoFlush', 'CheckCallAndFilter', 'CommandToStr',
-        'CheckCallAndFilterAndHeader', 'Error', 'ExecutionQueue', 'FileRead',
+        'CheckCallAndFilterAndHeader',
+        'enable_deletion_of_conflicting_checkouts', # TODO(borenet): Remove!
+        'Error', 'ExecutionQueue', 'FileRead',
         'FileWrite', 'FindFileUpwards', 'FindGclientRoot',
         'GetGClientRootAndEntries', 'GetEditor', 'GetExeSuffix',
         'GetMacWinOrLinux', 'GitFilter', 'IsDateRevision', 'MakeDateRevision',
         'MakeFileAutoFlush', 'MakeFileAnnotated', 'PathDifference',
         'ParseCodereviewSettingsContent', 'NumLocalCpus', 'PrintableObject',
         'RETRY_INITIAL_SLEEP', 'RETRY_MAX', 'RunEditor', 'GCLIENT_CHILDREN',
         'GCLIENT_CHILDREN_LOCK', 'GClientChildren', 'SplitUrlRevision',
         'SyntaxErrorToError', 'UpgradeToHttps', 'Wrapper', 'WorkItem',
         'codecs', 'lockedmethod', 'logging', 'os', 'pipes', 'Queue', 're',
-        'rmtree', 'safe_makedirs', 'safe_rename', 'stat', 'subprocess',
+        'rmtree', 'safe_makedirs', 'safe_rename',
+        'socket', # TODO(borenet): Remove!
+        'stat', 'subprocess',
         'subprocess2', 'sys', 'tempfile', 'threading', 'time', 'urlparse',
 
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(gclient_utils, members)
 
 
 
 class CheckCallAndFilterTestCase(GclientUtilBase):
   class ProcessIdMock(object):
@@ skipping 163 matching lines @@
     for content, expected in values:
       self.assertEquals(
           expected, gclient_utils.ParseCodereviewSettingsContent(content))
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: