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

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

 # Copyright 2014 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.layout_tests.builder_list import BuilderList
 from webkitpy.layout_tests.layout_package import bot_test_expectations
 from webkitpy.tool.commands import flaky_tests
 from webkitpy.tool.commands.command_test import CommandsTest
-from webkitpy.tool.mock_tool import MockWebKitPatch, MockOptions
+from webkitpy.tool.mock_tool import MockWebKitPatch
 
 
 class FakeBotTestExpectations(object):
 
     def expectation_lines(self):
         return []
 
 
 class FakeBotTestExpectationsFactory(object):
     FAILURE_MAP = {"A": "AUDIO", "C": "CRASH", "F": "TEXT", "I": "IMAGE", "O": "MISSING",
@@ skipping 46 matching lines @@
         lines = command._collect_expectation_lines(['foo-builder', 'bar-builder'], factory)
         self.assertEqual(len(lines), 1)
         self.assertEqual(lines[0].expectations, ['TEXT', 'TIMEOUT', 'PASS'])
         self.assertEqual(lines[0].specifiers, ['Mac', 'Linux'])
 
     def test_integration(self):
         command = flaky_tests.FlakyTests()
         tool = MockWebKitPatch()
         tool.builders = self.fake_builders_list()
         command.expectations_factory = FakeBotTestExpectationsFactory
-        options = MockOptions(upload=True)
+        options = optparse.Values({'upload': True})
         expected_stdout = flaky_tests.FlakyTests.OUTPUT % (
             flaky_tests.FlakyTests.HEADER,
             '',
             flaky_tests.FlakyTests.FLAKINESS_DASHBOARD_URL % '') + '\n'
 
         self.assert_execute_outputs(command, options=options, tool=tool, expected_stdout=expected_stdout)