Make MockOptions a thin wrapper around optparse.Values.

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

Index: third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py
index da91957ff01169f34759c1f200de064a1881e9d4..e74c2c1d8add7911ba549c560f0016d837cf3a45 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py
@@ -36,9 +36,13 @@ from webkitpy.tool.mock_tool import MockWebKitPatch, MockOptions
 
 class PrintExpectationsTest(unittest.TestCase):
 
-    def run_test(self, tests, expected_stdout, platform='test-win-win7', **args):
-        options = MockOptions(all=False, csv=False, full=False, platform=platform,
-                              include_keyword=[], exclude_keyword=[], paths=False).update(**args)
+    def run_test(self, tests, expected_stdout, platform='test-win-win7', **kwargs):
+        options_defaults = {
+            'all': False, 'csv': False, 'full': False, 'platform': platform,
+            'include_keyword': [], 'exclude_keyword': [], 'paths': False,
+        }
+        options_defaults.update(kwargs)
+        options = MockOptions(**options_defaults)
         tool = MockWebKitPatch()
         tool.port_factory.all_port_names = lambda: [
             'test-linux-trusty', 'test-linux-precise',