Unify MockExecutive and MockExecutive2.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/local_wpt_unittest.py

 # Copyright 2016 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 unittest
+
+from webkitpy.common.host_mock import MockHost
+from webkitpy.common.system.executive_mock import MockExecutive
+from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.w3c.local_wpt import LocalWPT
-from webkitpy.common.host_mock import MockHost
-from webkitpy.common.system.executive_mock import MockExecutive2
-from webkitpy.common.system.filesystem_mock import MockFileSystem
 
 
 class LocalWPTTest(unittest.TestCase):
 
     def test_fetches_if_wpt_exists(self):
         host = MockHost()
         host.filesystem = MockFileSystem(files={
             '/tmp/wpt': ''
         })
 
@@ skipping 32 matching lines @@
         self.assertEqual(len(host.executive.calls), 2)
         self.assertEqual(host.executive.calls[1], ['echo', 'rutabaga'])
 
     def test_last_wpt_exported_commit(self):
         host = MockHost()
         return_vals = [
             'deadbeefcafe',
             '123',
             '9ea4fc353a4b1c11c6e524270b11baa4d1ddfde8',
         ]
-        host.executive = MockExecutive2(run_command_fn=lambda _: return_vals.pop())
+        host.executive = MockExecutive(run_command_fn=lambda _: return_vals.pop())
         host.filesystem = MockFileSystem()
         local_wpt = LocalWPT(host, no_fetch=True)
 
         wpt_sha, chromium_commit = local_wpt.most_recent_chromium_commit()
         self.assertEqual(wpt_sha, '9ea4fc353a4b1c11c6e524270b11baa4d1ddfde8')
         self.assertEqual(chromium_commit.position, '123')
         self.assertEqual(chromium_commit.sha, 'deadbeefcafe')
 
     def test_last_wpt_exported_commit_not_found(self):
         host = MockHost()
-        host.executive = MockExecutive2(run_command_fn=lambda _: None)
+        host.executive = MockExecutive(run_command_fn=lambda _: None)
         host.filesystem = MockFileSystem()
         local_wpt = LocalWPT(host)
 
         commit = local_wpt.most_recent_chromium_commit()
         self.assertEqual(commit, (None, None))
 
     def test_create_branch_with_patch(self):
         host = MockHost()
         host.filesystem = MockFileSystem()
 
         local_wpt = LocalWPT(host)
 
         local_branch_name = local_wpt.create_branch_with_patch('message', 'patch')
         self.assertEqual(len(host.executive.calls), 9)
         self.assertEqual(local_branch_name, 'chromium-export-try')
         # TODO(jeffcarp): Add more specific assertions