Revert of Generate separate files for union type containers

third_party/WebKit/Source/bindings/scripts/utilities.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.
 
 """Utility functions (file reading, simple IDL parsing by regexes) for IDL build.
 
 Design doc: http://www.chromium.org/developers/design-documents/idl-build
 """
 
 import os
@@ skipping 70 matching lines @@
 
     @property
     def typedefs(self):
         return {}
 
     @property
     def union_types(self):
         return set()
 
     @property
-    def include_path_for_union_types(self, name):
+    def include_path_for_union_types(self):
         return None
 
 
 class ComponentInfoProviderCore(ComponentInfoProvider):
     def __init__(self, interfaces_info, component_info):
         super(ComponentInfoProviderCore, self).__init__()
         self._interfaces_info = interfaces_info
         self._component_info = component_info
 
     @property
     def interfaces_info(self):
         return self._interfaces_info
 
     @property
     def component_info(self):
         return self._component_info
 
     @property
     def enumerations(self):
         return self._component_info['enumerations']
 
     @property
     def typedefs(self):
         return self._component_info['typedefs']
 
     @property
     def union_types(self):
         return self._component_info['union_types']
 
-    def include_path_for_union_types(self, name):
-        return 'bindings/core/v8/%s.h' % name
+    @property
+    def include_path_for_union_types(self):
+        return 'bindings/core/v8/UnionTypesCore.h'
 
     @property
     def specifier_for_export(self):
         return 'CORE_EXPORT '
 
     @property
     def include_path_for_export(self):
         return 'core/CoreExport.h'
 
 
@@ skipping 24 matching lines @@
         typedefs = self._component_info_core['typedefs'].copy()
         typedefs.update(self._component_info_modules['typedefs'])
         return typedefs
 
     @property
     def union_types(self):
         # Remove duplicate union types from component_info_modules to avoid
         # generating multiple container generation.
         return self._component_info_modules['union_types'] - self._component_info_core['union_types']
 
-    def include_path_for_union_types(self, name):
-        core_union_type_names = [union_type.name for union_type
-                                 in self._component_info_core['union_types']]
-        if name in core_union_type_names:
-            return 'bindings/core/v8/%s.h' % name
-        return 'bindings/modules/v8/%s.h' % name
+    @property
+    def include_path_for_union_types(self):
+        return 'bindings/modules/v8/UnionTypesModules.h'
 
     @property
     def specifier_for_export(self):
         return 'MODULES_EXPORT '
 
     @property
     def include_path_for_export(self):
         return 'modules/ModulesExport.h'
 
 
@@ skipping 196 matching lines @@
     extended_attributes_string = match.group(1)
     match = re.search(r'[^=]\bExposed\(([^)]*)\)', file_contents)
     if not match:
         return None
     arguments = []
     for argument in map(string.strip, match.group(1).split(',')):
         exposed, runtime_enabled = argument.split()
         arguments.append({'exposed': exposed, 'runtime_enabled': runtime_enabled})
 
     return arguments