Move the setting of bindings code generator up the stack.

third_party/WebKit/Tools/Scripts/webkitpy/bindings/bindings_tests.py

 # Copyright (C) 2011 Google Inc.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
@@ skipping 22 matching lines @@
 from webkitpy.common.system.executive import Executive
 
 # Source/ path is needed both to find input IDL files, and to import other
 # Python modules.
 module_path = os.path.dirname(__file__)
 source_path = os.path.normpath(os.path.join(module_path, os.pardir, os.pardir,
                                             os.pardir, os.pardir, 'Source'))
 bindings_script_path = os.path.join(source_path, 'bindings', 'scripts')
 sys.path.append(bindings_script_path)  # for Source/bindings imports
 
-from code_generator_v8 import CodeGeneratorUnionType, CodeGeneratorCallbackFunction
+from code_generator_v8 import CodeGeneratorDictionaryImpl
+from code_generator_v8 import CodeGeneratorV8
+from code_generator_v8 import CodeGeneratorUnionType
+from code_generator_v8 import CodeGeneratorCallbackFunction
 from compute_interfaces_info_individual import InterfaceInfoCollector
 from compute_interfaces_info_overall import compute_interfaces_info_overall, interfaces_info
-from idl_compiler import IdlCompilerDictionaryImpl, IdlCompilerV8
+from idl_compiler import IdlCompiler
 from utilities import ComponentInfoProviderCore
 from utilities import ComponentInfoProviderModules
 from utilities import write_file
 
 
 PASS_MESSAGE = 'All tests PASS!'
 FAIL_MESSAGE = """Some tests FAIL!
 To update the reference files, execute:
     run-bindings-tests --reset-results
 
@@ skipping 230 matching lines @@
     try:
         generate_interface_dependencies()
         for component in COMPONENT_DIRECTORY:
             output_dir = os.path.join(output_directory, component)
             if not os.path.exists(output_dir):
                 os.makedirs(output_dir)
 
             generate_union_type_containers(output_dir, component)
             generate_callback_function_impl(output_dir, component)
 
-            idl_compiler = IdlCompilerV8(
-                output_dir,
+            idl_compiler = IdlCompiler(
+                output_directory=output_dir,
+                code_generator_class=CodeGeneratorV8,
                 info_provider=component_info_providers[component],
                 target_component=component)
             if component == 'core':
                 partial_interface_output_dir = os.path.join(output_directory,
                                                             'modules')
                 if not os.path.exists(partial_interface_output_dir):
                     os.makedirs(partial_interface_output_dir)
-                idl_partial_interface_compiler = IdlCompilerV8(
-                    partial_interface_output_dir,
+                idl_partial_interface_compiler = IdlCompiler(
+                    output_directory=partial_interface_output_dir,
+                    code_generator_class=CodeGeneratorV8,
                     info_provider=component_info_providers['modules'],
                     target_component='modules')
             else:
                 idl_partial_interface_compiler = None
 
-            dictionary_impl_compiler = IdlCompilerDictionaryImpl(
-                output_dir, info_provider=component_info_providers[component],
+            dictionary_impl_compiler = IdlCompiler(
+                output_directory=output_dir,
+                info_provider=component_info_providers[component],
+                code_generator_class=CodeGeneratorDictionaryImpl,
                 target_component=component)
 
             idl_filenames = []
             input_directory = os.path.join(test_input_directory, component)
             for filename in os.listdir(input_directory):
                 if (filename.endswith('.idl') and
                         # Dependencies aren't built
                         # (they are used by the dependent)
                         filename not in DEPENDENCY_IDL_FILES):
                     idl_filenames.append(
@@ skipping 30 matching lines @@
 
 
 def run_bindings_tests(reset_results, verbose):
     # Generate output into the reference directory if resetting results, or
     # a temp directory if not.
     if reset_results:
         print 'Resetting results'
         return bindings_tests(reference_directory, verbose)
     with TemporaryDirectory() as temp_dir:
         return bindings_tests(temp_dir, verbose)