Revert r80216 "Reapply r79779: "Removed gclient_utils.Popen() and use subprocess2's ...""

tests/gclient_utils_test.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 
 # pylint: disable=E1101,W0403
 
 import StringIO
 
 # Fixes include path.
@@ skipping 15 matching lines @@
   def testMembersChanged(self):
     members = [
         'CheckCall', 'CheckCallError', 'CheckCallAndFilter',
         'CheckCallAndFilterAndHeader', 'Error', 'ExecutionQueue', 'FileRead',
         'FileWrite', 'FindFileUpwards', 'FindGclientRoot',
         'GetGClientRootAndEntries', 'GetNamedNodeText', 'MakeFileAutoFlush',
         'GetNodeNamedAttributeText', 'MakeFileAnnotated', 'PathDifference',
         'ParseXML', 'Popen',
         'PrintableObject', 'RemoveDirectory', 'SoftClone', 'SplitUrlRevision',
         'SyntaxErrorToError', 'WorkItem',
-        'errno', 'logging', 'os', 'Queue', 're', 'rmtree',
-        'stat', 'subprocess', 'subprocess2', 'sys','threading', 'time', 'xml',
+        'errno', 'hack_subprocess', 'logging', 'os', 'Queue', 're', 'rmtree',
+        'stat', 'subprocess', 'sys','threading', 'time', 'xml',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(gclient_utils, members)
 
 
 class CheckCallTestCase(GclientUtilBase):
   def testCheckCallSuccess(self):
     args = ['boo', 'foo', 'bar']
     process = self.mox.CreateMockAnything()
     process.returncode = 0
@@ skipping 150 matching lines @@
     os.chmod(l3, 0)
     os.chmod(l2, 0)
     os.chmod(l1, 0)
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: