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

tools/dom/scripts/htmldartgenerator.py

 #!/usr/bin/python
 # Copyright (c) 2012, 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.
 
 """This module provides shared functionality for the system to generate
 dart:html APIs from the IDL database."""
 
 import emitter
 from generator import AnalyzeOperation, ConstantOutputOrder, \
     DartDomNameOfAttribute, FindMatchingAttribute, IsDartCollectionType, \
     IsPureInterface, TypeOrNothing, GetAnnotationsAndComments, \
     FormatAnnotationsAndComments, ConvertToFuture, GetCallbackInfo
 from htmlrenamer import convert_to_future_members
 
 # Types that are accessible cross-frame in a limited fashion.
 # In these cases, the base type (e.g., WindowBase) provides restricted access
 # while the subtype (e.g., Window) provides full access to the
 # corresponding objects if there are from the same frame.
 _secure_base_types = {
   'Window': 'WindowBase',
   'Location': 'LocationBase',
   'History': 'HistoryBase',
 }
 
+_custom_factories = [
+  'Notification',
+  'EventSource',
+]
 
 class HtmlDartGenerator(object):
   def __init__(self, interface, options):
     self._database = options.database
     self._interface = interface
     self._type_registry = options.type_registry
     self._interface_type_info = self._type_registry.TypeInfo(self._interface.id)
     self._renamer = options.renamer
     self._library_name = self._renamer.GetLibraryName(self._interface)
 
@@ skipping 442 matching lines @@
             NAME=name,
             FACTORY_PARAMS= \
                 constructor_info.ParametersAsArgumentList(argument_count))
         self.EmitStaticFactoryOverload(
             constructor_info, name,
             constructor_info.idl_args[signature_index][:argument_count])
 
       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,
           IsOptional)
 
   def _AddFutureifiedOperation(self, info, html_name):
     """Given a API function that uses callbacks, convert it to using Futures.
 
     This conversion assumes the success callback is always provided before the
     error callback (and so far in the DOM API, this is the case)."""
@@ skipping 137 matching lines @@
         walk(interface.parents)
       else:
         walk(interface.parents[1:])
     return result
 
   def _DartType(self, type_name):
     return self._type_registry.DartType(type_name)
 
   def _IsPrivate(self, name):
     return name.startswith('_')