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

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

Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py
index 2276f2a3d395c43fc84e30019088ff1753313793..d03200122955148c5877d041ec907f5553e4536b 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py
@@ -26,25 +26,21 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import optparse
 import unittest
 
 from webkitpy.common.system.systemhost_mock import MockSystemHost
-
 from webkitpy.layout_tests.port.base import Port
 from webkitpy.layout_tests.port.driver import Driver
-from webkitpy.layout_tests.port.driver import DriverOutput
-from webkitpy.layout_tests.port.server_process_mock import MockServerProcess
-
 # FIXME: remove the dependency on TestWebKitPort
 from webkitpy.layout_tests.port.port_testcase import TestWebKitPort
-
-from webkitpy.tool.mock_tool import MockOptions
+from webkitpy.layout_tests.port.server_process_mock import MockServerProcess
 
 
 class DriverTest(unittest.TestCase):
 
     def make_port(self):
-        port = Port(MockSystemHost(), 'test', MockOptions(configuration='Release'))
+        port = Port(MockSystemHost(), 'test', optparse.Values({'configuration': 'Release'}))
         return port
 
     def _assert_wrapper(self, wrapper_string, expected_wrapper):