Revert "Revert "Dartium changes for custom element lifecycle events.""

Source/bindings/dart/gyp/scripts/massage_factories.py

Index: Source/bindings/dart/gyp/scripts/massage_factories.py
diff --git a/Source/bindings/dart/gyp/scripts/massage_factories.py b/Source/bindings/dart/gyp/scripts/massage_factories.py
index cfb6e8710d2e3d9a8d2579849f73751de51d7974..c660a987565eed04f1be50a7bdb4b61d2f03f26a 100644
--- a/Source/bindings/dart/gyp/scripts/massage_factories.py
+++ b/Source/bindings/dart/gyp/scripts/massage_factories.py
@@ -67,7 +67,7 @@ def main(args):
     ])
     massage('cpp', [
         (re.compile(r'^#include "V8'), '#include "Dart'),
-        (re.compile(r'^#include "bindings/v8/CustomElementWrapper.h"'), '#include "bindings/dart/DartCustomElement.h"'),
+        (re.compile(r'^#include "bindings/v8/CustomElementWrapper.h"'), '#include "bindings/dart/DartCustomElementWrapper.h"'),
         (re.compile(r'v8\.h'), 'dart_api.h'),
         (re.compile(
             r'return wrap\(static_cast<(\w+)\*>\(element\), creationContext, isolate\);'),
@@ -92,12 +92,10 @@ def main(args):
             r'#include "bindings/v8/CustomElementHelpers.h"\n#include "bindings/dart/DartCustomElement.h"'),
         (re.compile(
             r'return CustomElementWrapper<%sElement, V8%sElement>::wrap\(element, creationContext, isolate, createWrapperFunction\);' % (tag, tag)),
-            r'return DartCustomElement::createWrapper(element, DartCustomElement::CreateWrapperFunction(createWrapperFunction));'),
+            r'return DartCustomElementWrapper<%sElement>::wrap(element, createWrapperFunction);' % tag),
         (re.compile(
             r'return wrap\(toHTMLUnknownElement\(element\), creationContext, isolate\);'),
-            # FIXME: We map custom elements to DartHTMLElement here instead of DartHTMLUnknownElement.
-            # This should be handled earlier.
-            r'return element->isCustomElement() ? DartDOMWrapper::createWrapper<DartHTMLElement>(element) : DartHTMLUnknownElement::createWrapper(toHTMLUnknownElement(element));'),
+            r'return DartHTMLUnknownElement::createWrapper(toHTMLUnknownElement(element));'),
         (re.compile(r'createV8%sWrapper' % tag), r'createDart%sWrapper' % tag),
         (re.compile(r', v8::Isolate\*( isolate)?'), ''),
         (re.compile(r', v8::Handle<v8::Object> creationContext'), ''),