Unify MockExecutive and MockExecutive2.

third_party/WebKit/Tools/Scripts/webkitpy/common/net/git_cl_unittest.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/common/net/git_cl_unittest.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/net/git_cl_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/net/git_cl_unittest.py
index bf076f32993df410a5816d61a86adf37e9c66d71..18c34af2fc54ef7557b11e4f0d7329d4ef725404 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/common/net/git_cl_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/common/net/git_cl_unittest.py
@@ -5,7 +5,7 @@
 import unittest
 
 from webkitpy.common.net.git_cl import GitCL
-from webkitpy.common.system.executive_mock import MockExecutive2
+from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.common.host_mock import MockHost
 
 
@@ -13,7 +13,7 @@ class GitCLTest(unittest.TestCase):
 
     def test_run(self):
         host = MockHost()
-        host.executive = MockExecutive2(output='mock-output')
+        host.executive = MockExecutive(output='mock-output')
         git_cl = GitCL(host)
         output = git_cl.run(['command'])
         self.assertEqual(output, 'mock-output')
@@ -21,7 +21,7 @@ class GitCLTest(unittest.TestCase):
 
     def test_run_with_auth(self):
         host = MockHost()
-        host.executive = MockExecutive2(output='mock-output')
+        host.executive = MockExecutive(output='mock-output')
         git_cl = GitCL(host, auth_refresh_token_json='token.json')
         git_cl.run(['upload'])
         self.assertEqual(
@@ -30,20 +30,20 @@ class GitCLTest(unittest.TestCase):
 
     def test_some_commands_not_run_with_auth(self):
         host = MockHost()
-        host.executive = MockExecutive2(output='mock-output')
+        host.executive = MockExecutive(output='mock-output')
         git_cl = GitCL(host, auth_refresh_token_json='token.json')
         git_cl.run(['issue'])
         self.assertEqual(host.executive.calls, [['git', 'cl', 'issue']])
 
     def test_get_issue_number(self):
         host = MockHost()
-        host.executive = MockExecutive2(output='Issue number: 12345 (http://crrev.com/12345)')
+        host.executive = MockExecutive(output='Issue number: 12345 (http://crrev.com/12345)')
         git_cl = GitCL(host)
         self.assertEqual(git_cl.get_issue_number(), '12345')
 
     def test_get_issue_number_none(self):
         host = MockHost()
-        host.executive = MockExecutive2(output='Issue number: None (None)')
+        host.executive = MockExecutive(output='Issue number: None (None)')
         git_cl = GitCL(host)
         self.assertEqual(git_cl.get_issue_number(), 'None')