Remove MockOptions, and replace all usages of it with optparse.Values.

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/auto_rebaseline_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 optparse
+
 from webkitpy.common.net.buildbot import Build
 from webkitpy.common.net.layouttestresults import LayoutTestResults
 from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.layout_tests.builder_list import BuilderList
 from webkitpy.tool.commands.auto_rebaseline import AutoRebaseline
 from webkitpy.tool.commands.rebaseline_unittest import BaseTestCase
 from webkitpy.tool.commands.rebaseline_unittest import MockLineRemovingExecutive
-from webkitpy.tool.mock_tool import MockOptions
 
 
 class TestAutoRebaseline(BaseTestCase):
     command_constructor = AutoRebaseline
 
     def _write_test_file(self, port, path, contents):
         abs_path = self.tool.filesystem.join(port.layout_tests_dir(), path)
         self.tool.filesystem.write_text_file(abs_path, contents)
 
     def _execute_with_mock_options(self, auth_refresh_token_json=None, commit_author=None, dry_run=False):
         self.command.execute(
-            MockOptions(optimize=True, verbose=False, results_directory=False,
-                        auth_refresh_token_json=auth_refresh_token_json,
-                        commit_author=commit_author, dry_run=dry_run),
-            [], self.tool)
+            optparse.Values({
+                'optimize': True,
+                'verbose': False,
+                'results_directory': False,
+                'auth_refresh_token_json': auth_refresh_token_json,
+                'commit_author': commit_author,
+                'dry_run': dry_run
+            }),
+            [],
+            self.tool)
 
     def setUp(self):
         super(TestAutoRebaseline, self).setUp()
         self.tool.builders = BuilderList({
             "MOCK Mac10.10": {"port_name": "test-mac-mac10.10", "specifiers": ["Mac10.10", "Release"]},
             "MOCK Mac10.11": {"port_name": "test-mac-mac10.11", "specifiers": ["Mac10.11", "Release"]},
             "MOCK Precise": {"port_name": "test-linux-precise", "specifiers": ["Precise", "Release"]},
             "MOCK Trusty": {"port_name": "test-linux-trusty", "specifiers": ["Trusty", "Release"]},
             "MOCK Win7": {"port_name": "test-win-win7", "specifiers": ["Win7", "Release"]},
             "MOCK Win7 (dbg)": {"port_name": "test-win-win7", "specifiers": ["Win7", "Debug"]},
@@ skipping 476 matching lines @@
 
     def test_execute_with_dry_run(self):
         self._basic_execute_test([], dry_run=True)
         self.assertEqual(self.tool.scm().local_commits(), [])
 
     def test_bot_revision_data(self):
         self._setup_mock_build_data()
         self.assertEqual(
             self.command.bot_revision_data(self.tool.scm()),
             [{'builder': 'MOCK Win7', 'revision': '9000'}])