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

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

Index: third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_from_try_jobs_unittest.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_from_try_jobs_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_from_try_jobs_unittest.py
index 19f17e2fd9f7754e0fa4fd34e48bd30e2e3e1ca9..ddc98b022701f921aa56ccadd242f44f4cd69587 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_from_try_jobs_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_from_try_jobs_unittest.py
@@ -2,16 +2,16 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import optparse
 import json
 
+from webkitpy.common.checkout.scm.scm_mock import MockSCM
 from webkitpy.common.net.buildbot import Build
 from webkitpy.common.net.web_mock import MockWeb
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.layout_tests.builder_list import BuilderList
 from webkitpy.tool.commands.rebaseline_from_try_jobs import RebaselineFromTryJobs
 from webkitpy.tool.commands.rebaseline_unittest import BaseTestCase
-from webkitpy.tool.mock_tool import MockOptions
-from webkitpy.common.checkout.scm.scm_mock import MockSCM
 
 
 class RebaselineFromTryJobsTest(BaseTestCase):
@@ -62,7 +62,7 @@ class RebaselineFromTryJobsTest(BaseTestCase):
             'results_directory': None,
         }
         options.update(kwargs)
-        return MockOptions(**options)
+        return optparse.Values(dict(**options))
 
     def test_execute_with_issue_number_given(self):
         oc = OutputCapture()