"Reverting 19586"

tools/dom/scripts/systemhtml.py

Index: tools/dom/scripts/systemhtml.py
diff --git a/tools/dom/scripts/systemhtml.py b/tools/dom/scripts/systemhtml.py
index f2afbdc72c1049b672d0aadc28b8e4c885d0552b..7a0c5dd35d437668aeb3070f1f481d129fa00cfa 100644
--- a/tools/dom/scripts/systemhtml.py
+++ b/tools/dom/scripts/systemhtml.py
@@ -421,7 +421,9 @@ class HtmlDartInterfaceGenerator(object):
 
   def GenerateCallback(self):
     """Generates a typedef for the callback interface."""
-    info = GetCallbackInfo(self._interface)
+    handlers = [operation for operation in self._interface.operations
+                if operation.id == 'handleEvent']
+    info = AnalyzeOperation(self._interface, handlers)
     code = self._library_emitter.FileEmitter(self._interface.id,
         self._library_name)
     code.Emit(self._template_loader.Load('callback.darttemplate'))
@@ -858,8 +860,6 @@ class Dart2JSBackend(HtmlDartGenerator):
 
     if IsPureInterface(self._interface.id):
       self._AddInterfaceOperation(info, html_name)
-    elif info.callback_args:
-      self._AddFutureifiedOperation(info, html_name)
     elif any(self._OperationRequiresConversions(op) for op in info.overloads):
       # Any conversions needed?
       self._AddOperationWithConversions(info, html_name)