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

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/auto_rebaseline_unittest.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/auto_rebaseline_unittest.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/auto_rebaseline_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/auto_rebaseline_unittest.py
index d768ab9dfd16c5b00c9a09417e201b9133e72a42..08bae6458859b3099c8bdbec96ad7f13ee6ffbda 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/auto_rebaseline_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/auto_rebaseline_unittest.py
@@ -2,6 +2,8 @@
 # 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
@@ -9,7 +11,6 @@ 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):
@@ -21,10 +22,16 @@ class TestAutoRebaseline(BaseTestCase):
 
     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()