Reapply the expanded names with the correct form of requestFileSystem on the

tools/dom/scripts/htmldartgenerator.py

Index: tools/dom/scripts/htmldartgenerator.py
diff --git a/tools/dom/scripts/htmldartgenerator.py b/tools/dom/scripts/htmldartgenerator.py
index cebafab4dd146659431d1b26536537b4950930a8..85ffd4c4acffc1099f58525524202761cee4b166 100644
--- a/tools/dom/scripts/htmldartgenerator.py
+++ b/tools/dom/scripts/htmldartgenerator.py
@@ -23,6 +23,10 @@ _secure_base_types = {
   'History': 'HistoryBase',
 }
 
+_custom_factories = [
+  'Notification',
+  'EventSource',
+]
 
 class HtmlDartGenerator(object):
   def __init__(self, interface, options):
@@ -485,12 +489,18 @@ class HtmlDartGenerator(object):
       def IsOptional(signature_index, argument):
         return self.IsConstructorArgumentOptional(argument)
 
+      custom_factory_ctr = self._interface.id in _custom_factories
+      constructor_full_name = constructor_info._ConstructorFullName(
+          self._DartType)
       self._GenerateOverloadDispatcher(
           constructor_info.idl_args,
           False,
           [info.name for info in constructor_info.param_infos],
-          emitter.Format('$(ANNOTATIONS)factory $CTOR($PARAMS)',
-            CTOR=constructor_info._ConstructorFullName(self._DartType),
+          emitter.Format('$(ANNOTATIONS)$FACTORY_KEYWORD $CTOR($PARAMS)',
+            FACTORY_KEYWORD=('factory' if not custom_factory_ctr else
+                'static %s' % constructor_full_name),
+            CTOR=(('' if not custom_factory_ctr else '_factory')
+                + constructor_full_name),
             ANNOTATIONS=annotations,
             PARAMS=constructor_info.ParametersDeclaration(self._DartType)),
           GenerateCall,