Switch trace_inputs.py and isolate.py to subcommand.py.

tests/isolate_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 cStringIO
 import hashlib
 import json
 import logging
 import os
@@ skipping 1544 matching lines @@
     self.assertEqual(expected_saved_state, actual_saved_state)
     self.assertEqual(
         [
           'foo.0.isolated', 'foo.1.isolated',
           'foo.isolated', 'foo.isolated.state',
         ],
         sorted(os.listdir(self.directory)))
 
 
 class IsolateCommand(IsolateBase):
-  def setUp(self):
-    super(IsolateCommand, self).setUp()
-    self._old_get_command_handler = isolate.trace_inputs.get_command_handler
-    isolate.trace_inputs.get_command_handler = (
-        lambda name: getattr(isolate, 'CMD%s' % name, None))
-
-  def tearDown(self):
-    isolate.trace_inputs.get_command_handler = self._old_get_command_handler
-    super(IsolateCommand, self).tearDown()
-
   def test_CMDrewrite(self):
     isolate_file = os.path.join(self.cwd, 'x.isolate')
     data = (
       '# Foo',
       '{',
       '}',
     )
     with open(isolate_file, 'wb') as f:
       f.write('\n'.join(data))
 
-    self.assertEqual(0, isolate.CMDrewrite(['-i', isolate_file]))
+    cmd = ['-i', isolate_file]
+    self.assertEqual(0, isolate.CMDrewrite(isolate.OptionParserIsolate(), cmd))
     with open(isolate_file, 'rb') as f:
       actual = f.read()
 
     expected = "# Foo\n{\n  'conditions': [\n  ],\n}\n"
     self.assertEqual(expected, actual)
 
   if sys.platform != 'win32':
     def test_CMDcheck_no_mode_on_windows(self):
       # Store for Windows, make sure file mode are not included. Hopefully, run
       # this test on another OS.
       isolate_file = os.path.join(
           ROOT_DIR, 'tests', 'isolate', 'symlink_full.isolate')
       isolated_file = os.path.join(self.cwd, 'foo.isolated')
       cmd = [
         '-i', isolate_file,
         '-V', 'OS', 'win',
         '-V', 'chromeos', '0',
         '-s', isolated_file,
       ]
-      self.assertEqual(0, isolate.CMDcheck(cmd))
+      self.assertEqual(0, isolate.CMDcheck(isolate.OptionParserIsolate(), cmd))
       with open(isolated_file, 'rb') as f:
         actual = json.load(f)
       mapped = [
         os.path.join('files2', 'subdir', '42.txt'),
         os.path.join('files2', 'test_file1.txt'),
         os.path.join('files2', 'test_file2.txt'),
         os.path.join('symlink_full.py'),
       ]
       files = dict(
           (
@@ skipping 13 matching lines @@
       self.assertEqual(expected, actual)
 
 
 if __name__ == '__main__':
   logging.basicConfig(
       level=logging.DEBUG if '-v' in sys.argv else logging.ERROR,
       format='%(levelname)5s %(filename)15s(%(lineno)3d): %(message)s')
   if '-v' in sys.argv:
     unittest.TestCase.maxDiff = None
   unittest.main()