Fixing cleanup of dart:html annotation generation.

tools/dom/scripts/systemnative.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 systems to generate
 native binding from the IDL database."""
 
 import emitter
 import os
@@ skipping 731 matching lines @@
       # Generate to Dart conversion of C++ value.
       to_dart_conversion = return_type_info.to_dart_conversion(function_call, self._interface.id, ext_attrs)
       invocation_emitter.Emit(
         '        Dart_Handle returnValue = $TO_DART_CONVERSION;\n'
         '        if (returnValue)\n'
         '            Dart_SetReturnValue(args, returnValue);\n',
         TO_DART_CONVERSION=to_dart_conversion)
 
   def _GenerateNativeBinding(self, idl_name, argument_count, dart_declaration,
       native_suffix, is_custom):
-    annotations = FindCommonAnnotations(self._interface.id, idl_name)
-    if annotations:
-      annotation_str = '\n  ' + '\n  '.join(annotations)
-    else:
-      annotation_str = ''
+    annotations = FormatAnnotations(
+        FindCommonAnnotations(self._interface.id, idl_name), '  ')
 
     native_binding = '%s_%s_%s' % (self._interface.id, idl_name, native_suffix)
     self._members_emitter.Emit(
-        '$ANNOTATIONS'
-        '\n  $DART_DECLARATION native "$NATIVE_BINDING";\n',
+        '\n'
+        '  $ANNOTATIONS$DART_DECLARATION native "$NATIVE_BINDING";\n',
         DOMINTERFACE=self._interface.id,
-        ANNOTATIONS=annotation_str,
+        ANNOTATIONS=annotations,
         DART_DECLARATION=dart_declaration,
         NATIVE_BINDING=native_binding)
 
     cpp_callback_name = '%s%s' % (idl_name, native_suffix)
     self._cpp_resolver_emitter.Emit(
         '    if (argumentCount == $ARGC && name == "$NATIVE_BINDING")\n'
         '        return Dart$(INTERFACE_NAME)Internal::$CPP_CALLBACK_NAME;\n',
         ARGC=argument_count,
         NATIVE_BINDING=native_binding,
         INTERFACE_NAME=self._interface.id,
@@ skipping 97 matching lines @@
         LIBRARY_NAME=library_name)
 
       headers = self._library_headers[library_name]
       for header_file in headers:
         path = os.path.relpath(header_file, output_dir)
         includes_emitter.Emit('#include "$PATH"\n', PATH=path)
         body_emitter.Emit(
             '    if (Dart_NativeFunction func = $CLASS_NAME::resolver(name, argumentCount))\n'
             '        return func;\n',
             CLASS_NAME=os.path.splitext(os.path.basename(path))[0])