Revert "Chrome 38 script changes from integration branch"

tools/dom/scripts/databasebuilder.py

 #!/usr/bin/python
 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 import copy
 import database
 import idlparser
 import logging
-import monitored
 import multiprocessing
 import os
 import os.path
 import re
 import sys
 import tempfile
 import time
 import traceback
 
 import idl_validator
@@ skipping 169 matching lines @@
     """DatabaseBuilder is used for importing and merging interfaces into
     the Database"""
     self._database = database
     self._imported_interfaces = []
     self._impl_stmts = []
     self.conditionals_met = set()
 
     # Spin up the new IDL parser.
     self.build = Build(None)
 
-    # Global typedef to mapping.
-    self.global_type_defs = monitored.Dict('databasebuilder.global_type_defs', {
-      'Transferable' : 'MessagePort',
-    })
-
-  # TODO(terry): Consider keeping richer type information (e.g.,
-  #              IdlArrayOrSequenceType from the Blink parser) instead of just
-  #              a type name.
   def _resolve_type_defs(self, idl_file):
+    type_def_map = {}
+    # build map
+    for type_def in idl_file.typeDefs:
+      if type_def.type.id != type_def.id: # sanity check
+        type_def_map[type_def.id] = type_def.type.id
+    # use the map
     for type_node in idl_file.all(IDLType):
-      type_name = type_node.id
-      for typedef in self.global_type_defs:
-        seq_name_typedef = 'sequence<%s>' % typedef
-        if type_name == typedef:
-          type_node.id = self.global_type_defs[typedef]
-        elif type_name == seq_name_typedef:
-          type_node.id = 'sequence<%s>' % self.global_type_defs[typedef]
+      while type_node.id in type_def_map:
+        type_node.id = type_def_map[type_node.id]
 
   def _strip_ext_attributes(self, idl_file):
     """Strips unuseful extended attributes."""
     for ext_attrs in idl_file.all(IDLExtAttrs):
       # TODO: Decide which attributes are uninteresting.
       pass
 
   def _rename_types(self, idl_file, import_options):
     """Rename interface and type names with names provided in the
     options. Also clears scopes from scoped names"""
@@ skipping 578 matching lines @@
       # TODO(antonm): Ideally we'd like to have pristine copy of WebKit IDLs and fetch
       # this information directly from it.  Unfortunately right now database is massaged
       # a lot so it's difficult to maintain necessary information on Window itself.
       interface = self._database.GetInterface(type)
       if 'V8EnabledPerContext' in attr.ext_attrs:
         interface.ext_attrs['synthesizedV8EnabledPerContext'] = \
             attr.ext_attrs['V8EnabledPerContext']
       if 'V8EnabledAtRuntime' in attr.ext_attrs:
         interface.ext_attrs['synthesizedV8EnabledAtRuntime'] = \
             attr.ext_attrs['V8EnabledAtRuntime'] or attr.id