Unify MockExecutive and MockExecutive2.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater_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.w3c.deps_updater import DepsUpdater
-from webkitpy.common.host_mock import MockHost
-from webkitpy.common.system.executive_mock import MockExecutive2
 
 
 class DepsUpdaterTest(unittest.TestCase):
 
     def test_generate_email_list(self):
         updater = DepsUpdater(MockHost())
         changed_files = [
             'third_party/WebKit/LayoutTests/foo/bar/file.html',
             'third_party/WebKit/LayoutTests/foo/bar/otherfile.html',
             'third_party/WebKit/LayoutTests/foo/baz/files.html',
@@ skipping 37 matching lines @@
         updater.update_all_test_expectations_files(deleted_tests, renamed_test_pairs)
         self.assertMultiLineEqual(
             host.filesystem.read_text_file('/mock-checkout/third_party/WebKit/LayoutTests/TestExpectations'),
             ('Bug(test) new/a.html [ Failure ]\n'
              'Bug(test) new/c.html [ Failure ]\n'))
 
     # Tests for protected methods - pylint: disable=protected-access
 
     def test_cl_description_with_empty_environ(self):
         host = MockHost()
-        host.executive = MockExecutive2(output='Last commit message\n')
+        host.executive = MockExecutive(output='Last commit message\n')
         updater = DepsUpdater(host)
         description = updater._cl_description()
         self.assertEqual(
             description,
             ('Last commit message\n'
              'TBR=qyearsley@chromium.org\n'
              'NOEXPORT=true'))
         self.assertEqual(host.executive.calls, [['git', 'log', '-1', '--format=%B']])
 
     def test_cl_description_with_environ_variables(self):
         host = MockHost()
-        host.executive = MockExecutive2(output='Last commit message\n')
+        host.executive = MockExecutive(output='Last commit message\n')
         updater = DepsUpdater(host)
         updater.host.environ['BUILDBOT_MASTERNAME'] = 'my.master'
         updater.host.environ['BUILDBOT_BUILDERNAME'] = 'b'
         updater.host.environ['BUILDBOT_BUILDNUMBER'] = '123'
         description = updater._cl_description()
         self.assertEqual(
             description,
             ('Last commit message\n'
              'Build: https://build.chromium.org/p/my.master/builders/b/builds/123\n\n'
              'TBR=qyearsley@chromium.org\n'
              'NOEXPORT=true'))
         self.assertEqual(host.executive.calls, [['git', 'log', '-1', '--format=%B']])