Re-re-land gclient deletion of mismatching checkouts again

tests/gclient_utils_test.py

Index: tests/gclient_utils_test.py
diff --git a/tests/gclient_utils_test.py b/tests/gclient_utils_test.py
index 348787f74900c223282f2523f96f359497d5ec0d..37ebfe11907cebde25a8ae4f3f02b5b7a5bf1b49 100755
--- a/tests/gclient_utils_test.py
+++ b/tests/gclient_utils_test.py
@@ -29,7 +29,9 @@ class GclientUtilsUnittest(GclientUtilBase):
   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', 'IsDateRevision', 'MakeDateRevision',
@@ -39,7 +41,9 @@ class GclientUtilsUnittest(GclientUtilBase):
         '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',
 
     ]