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

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android_unittest.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android_unittest.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android_unittest.py
index 139440374fc04c63b49b1db70f3e385743bfaf3a..352eb1571ad1c6763afb2bb6818f8165c2207187 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android_unittest.py
@@ -31,15 +31,11 @@ import os
 import time
 import unittest
 
-from webkitpy.common.system import executive_mock
 from webkitpy.common.system.executive_mock import MockExecutive2
 from webkitpy.common.system.systemhost_mock import MockSystemHost
-
 from webkitpy.layout_tests.port import android
-from webkitpy.layout_tests.port import port_testcase
-from webkitpy.layout_tests.port import driver
 from webkitpy.layout_tests.port import driver_unittest
-from webkitpy.tool.mock_tool import MockOptions
+from webkitpy.layout_tests.port import port_testcase
 
 # Type of tombstone test which the mocked Android Debug Bridge should execute.
 VALID_TOMBSTONE_TEST_TYPE = 0
@@ -167,7 +163,7 @@ class AndroidPortTest(port_testcase.PortTestCase):
 
     def test_check_build(self):
         host = MockSystemHost()
-        port = self.make_port(host=host, options=MockOptions(child_processes=1))
+        port = self.make_port(host=host, options=optparse.Values({'child_processes': 1}))
         host.filesystem.exists = lambda p: True
         port.check_build(needs_http=True, printer=port_testcase.FakePrinter())
 
@@ -247,10 +243,12 @@ class ChromiumAndroidTwoPortsTest(unittest.TestCase):
         mock_adb = MockAndroidDebugBridge(2)
         mock_executive = MockExecutive2(run_command_fn=mock_adb.run_command)
 
-        port0 = android.AndroidPort(MockSystemHost(executive=mock_executive),
-                                    'android', options=MockOptions(additional_driver_flag=['--foo=bar']))
-        port1 = android.AndroidPort(MockSystemHost(executive=mock_executive),
-                                    'android', options=MockOptions(driver_name='content_shell'))
+        port0 = android.AndroidPort(
+            MockSystemHost(executive=mock_executive), 'android',
+            options=optparse.Values({'additional_driver_flag': ['--foo=bar']}))
+        port1 = android.AndroidPort(
+            MockSystemHost(executive=mock_executive), 'android',
+            options=optparse.Values({'driver_name': 'content_shell'}))
 
         self.assertEqual(1, port0.driver_cmd_line().count('--foo=bar'))
         self.assertEqual(0, port1.driver_cmd_line().count('--create-stdin-fifo'))