From f0eb24f46f2a9f546806d638d8fcb07c4cd37831 Mon Sep 17 00:00:00 2001
From: Kevin Schaaf <kschaaf@google.com>
Date: Mon, 22 Aug 2016 10:19:28 -0700
Subject: [PATCH 1/8] Remove createShadowRoot()

---
 src/elements/element.html                       |  5 ++---
 test/smoke/bindings.html                        |  5 ++---
 test/smoke/css-properties.html                  |  2 +-
 test/smoke/data-lazy.html                       |  4 ++--
 test/smoke/data-observers.html                  |  4 ++--
 test/smoke/data-path.html                       |  6 +++---
 test/smoke/dom-if.html                          |  2 +-
 test/smoke/dom-repeat.html                      |  2 +-
 test/smoke/properties-invalidate-be.html        |  2 +-
 test/smoke/properties-invalidate-raw.html       |  2 +-
 test/smoke/properties-invalidate-stampino.html  |  2 +-
 test/smoke/shadow-with-css.html                 |  2 +-
 test/smoke/shady-with-css-dynamic.html          |  2 +-
 test/smoke/shady-with-css.html                  |  2 +-
 test/smoke/shady.html                           | 10 +++++-----
 test/smoke/template-polymer.html                | 10 +++++-----
 test/smoke/template.html                        |  8 ++++----
 test/smoke/templatizer.html                     |  2 +-
 test/smoke/utils.html                           |  2 +-
 test/unit/styling-cross-scope-unknown-host.html |  6 +-----
 20 files changed, 37 insertions(+), 43 deletions(-)

diff --git a/src/elements/element.html b/src/elements/element.html
index d9a07208c3..407c568c6d 100644
--- a/src/elements/element.html
+++ b/src/elements/element.html
@@ -217,9 +217,8 @@
       ready() {
         if (!this.root) {
           if (this._template) {
-            // BREAKME(sorvell): remove v0 support when we can...
-            this.root = Polymer.shadowDomV0 ? this.createShadowRoot() :
-              this.attachShadow({mode: 'open'});
+            // BREAKME(sorvell): v0 support removed
+            this.root = this.attachShadow({mode: 'open'});
           } else {
             this.root = this;
           }
diff --git a/test/smoke/bindings.html b/test/smoke/bindings.html
index 48451e53a6..fa1a57c064 100644
--- a/test/smoke/bindings.html
+++ b/test/smoke/bindings.html
@@ -67,7 +67,7 @@
       createdCallback() {
         var dom = document.importNode(template.content, true);
         propertyEffects.setupBindings(this, dom, notes);
-        this.createShadowRoot().appendChild(dom);
+        this.attachShadow({mode:'open'}).appendChild(dom);
       }
 
       concat(a, b) {
@@ -90,8 +90,7 @@
       createdCallback() {
         var dom = document.importNode(clientTemplate.content, true);
         propertyEffects.setupBindings(this, dom, clientNotes);
-        this.createShadowRoot().appendChild(dom);
-        //this.attachShadow({mode: 'open'}).appendChild(dom);
+        this.attachShadow({mode: 'open'}).appendChild(dom);
       }
 
     }
diff --git a/test/smoke/css-properties.html b/test/smoke/css-properties.html
index 4cb336b2d5..61cec2df2b 100644
--- a/test/smoke/css-properties.html
+++ b/test/smoke/css-properties.html
@@ -43,7 +43,7 @@
     this._styles = [style];
     style.remove();
     before.textContent = style.textContent;
-    this.createShadowRoot().appendChild(content);
+    this.attachShadow({mode:'open'}).appendChild(content);
     this.root = this.shadowRoot;
     style = this.style();
     let output = this.root.querySelector('#after');
diff --git a/test/smoke/data-lazy.html b/test/smoke/data-lazy.html
index 8caa60be41..76194ab0a4 100644
--- a/test/smoke/data-lazy.html
+++ b/test/smoke/data-lazy.html
@@ -105,7 +105,7 @@
 
       createdCallback() {
         data.prepare(this, function() {
-          this.createShadowRoot().appendChild(data.stamp(this, template))
+          this.attachShadow({mode:'open'}).appendChild(data.stamp(this, template))
         });
         if (!this.__registered) {
           registerXProperties(this.__proto__);
@@ -193,7 +193,7 @@
 
       createdCallback() {
         data.prepare(this, function() {
-          this.createShadowRoot().appendChild(data.stamp(this, clientTemplate))
+          this.attachShadow({mode:'open'}).appendChild(data.stamp(this, clientTemplate))
         });
         if (!this.__registered) {
           registerXClient(this.__proto__);
diff --git a/test/smoke/data-observers.html b/test/smoke/data-observers.html
index 59edce4c3d..e85ed0a8ea 100644
--- a/test/smoke/data-observers.html
+++ b/test/smoke/data-observers.html
@@ -62,7 +62,7 @@
       createdCallback() {
         this.prop = 'prop';
         var dom = data.ensureStamped(this, hostTemplate);
-        this.createShadowRoot().appendChild(dom);
+        this.attachShadow({mode:'open'}).appendChild(dom);
       }
       _propChanged(value) {
         console.log('host:', 'propChanged:', value);
@@ -87,7 +87,7 @@
     class XClient extends HTMLElement {
       createdCallback() {
         var dom = data.ensureStamped(this, clientTemplate);
-        this.createShadowRoot().appendChild(dom);
+        this.attachShadow({mode:'open'}).appendChild(dom);
       }
       _propChanged(value) {
         console.log('client:', 'propChanged:', value);
diff --git a/test/smoke/data-path.html b/test/smoke/data-path.html
index 7efc4aa804..b054df516e 100644
--- a/test/smoke/data-path.html
+++ b/test/smoke/data-path.html
@@ -82,7 +82,7 @@
       }
       createdCallback() {
         data.prepare(this, function() {
-          this.createShadowRoot().appendChild(data.stamp(this, objTemplate));
+          this.attachShadow({mode:'open'}).appendChild(data.stamp(this, objTemplate));
         });
       }
       connectedCallback() {
@@ -102,7 +102,7 @@
       }
       createdCallback() {
         data.prepare(this, function() {
-          this.createShadowRoot().appendChild(data.stamp(this, propTemplate));
+          this.attachShadow({mode:'open'}).appendChild(data.stamp(this, propTemplate));
         });
       }
       connectedCallback() {
@@ -123,7 +123,7 @@
       }
       createdCallback() {
         data.prepare(this, function() {
-          this.createShadowRoot().appendChild(data.stamp(this, hostTemplate));
+          this.attachShadow({mode:'open'}).appendChild(data.stamp(this, hostTemplate));
         });
         this.hdata = {
           obj1: {
diff --git a/test/smoke/dom-if.html b/test/smoke/dom-if.html
index 9debfa8a9c..3ec6480c0d 100644
--- a/test/smoke/dom-if.html
+++ b/test/smoke/dom-if.html
@@ -36,7 +36,7 @@
       }
       createdCallback() {
         data.prepare(this, function() {
-          this.createShadowRoot().appendChild(data.stamp(this, template));
+          this.attachShadow({mode:'open'}).appendChild(data.stamp(this, template));
         });
         this.hostProp = 'prop';
       }
diff --git a/test/smoke/dom-repeat.html b/test/smoke/dom-repeat.html
index 79a3e8aa8a..da165398a1 100644
--- a/test/smoke/dom-repeat.html
+++ b/test/smoke/dom-repeat.html
@@ -42,7 +42,7 @@
         createdCallback() {
           var self = this;
           data.prepare(this, function() {
-            this.createShadowRoot().appendChild(data.stamp(this, template));
+            this.attachShadow({mode:'open'}).appendChild(data.stamp(this, template));
           });
           this.items = [
             {prop: 'a'},
diff --git a/test/smoke/properties-invalidate-be.html b/test/smoke/properties-invalidate-be.html
index 861e140b79..dcbe71a594 100644
--- a/test/smoke/properties-invalidate-be.html
+++ b/test/smoke/properties-invalidate-be.html
@@ -55,7 +55,7 @@
       createdCallback() {
         attributes.simulateV1AttributeCallbacks(this);
         this.dom = new XTestDom();
-        this.createShadowRoot().appendChild(data.stamp(template, this.dom));
+        this.attachShadow({mode:'open'}).appendChild(data.stamp(template, this.dom));
         data.enablePropertyEffects(this.dom);
       }
 
diff --git a/test/smoke/properties-invalidate-raw.html b/test/smoke/properties-invalidate-raw.html
index f9754482b7..0d6b614603 100644
--- a/test/smoke/properties-invalidate-raw.html
+++ b/test/smoke/properties-invalidate-raw.html
@@ -50,7 +50,7 @@
 
       createdCallback() {
         attributes.simulateV1AttributeCallbacks(this);
-        this.createShadowRoot().appendChild(document.importNode(template.content, true));
+        this.attachShadow({mode:'open'}).appendChild(document.importNode(template.content, true));
       }
 
       validate(props, oldProps, changedProps) {
diff --git a/test/smoke/properties-invalidate-stampino.html b/test/smoke/properties-invalidate-stampino.html
index 98714bf27f..79d7aa98c2 100644
--- a/test/smoke/properties-invalidate-stampino.html
+++ b/test/smoke/properties-invalidate-stampino.html
@@ -56,7 +56,7 @@
       createdCallback() {
         attributes.simulateV1AttributeCallbacks(this);
         this.dom = new XTestDom();
-        this.createShadowRoot().appendChild(data.stamp(template, this.dom));
+        this.attachShadow({mode:'open'}).appendChild(data.stamp(template, this.dom));
         data.enablePropertyEffects(this.dom);
       }
 
diff --git a/test/smoke/shadow-with-css.html b/test/smoke/shadow-with-css.html
index 45f73a41b0..423b6e0f38 100644
--- a/test/smoke/shadow-with-css.html
+++ b/test/smoke/shadow-with-css.html
@@ -102,7 +102,7 @@
       attachedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
-          this.createShadowRoot().appendChild(
+          this.attachShadow({mode:'open'}).appendChild(
             document.importNode(template.content, true));
         }
         var d = document.createElement('div');
diff --git a/test/smoke/shady-with-css-dynamic.html b/test/smoke/shady-with-css-dynamic.html
index 6ee7068593..ab2d84e21c 100644
--- a/test/smoke/shady-with-css-dynamic.html
+++ b/test/smoke/shady-with-css-dynamic.html
@@ -119,7 +119,7 @@
       attachedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
-          this.createShadowRoot().appendChild(
+          this.attachShadow({mode:'open'}).appendChild(
             document.importNode(template.content, true));
         }
         var d = document.createElement('div');
diff --git a/test/smoke/shady-with-css.html b/test/smoke/shady-with-css.html
index d76b84af4d..65258bc55c 100644
--- a/test/smoke/shady-with-css.html
+++ b/test/smoke/shady-with-css.html
@@ -104,7 +104,7 @@
       attachedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
-          this.createShadowRoot().appendChild(
+          this.attachShadow({mode:'open'}).appendChild(
             document.importNode(template.content, true));
         }
         var d = document.createElement('div');
diff --git a/test/smoke/shady.html b/test/smoke/shady.html
index 110ff50778..fc764b865e 100644
--- a/test/smoke/shady.html
+++ b/test/smoke/shady.html
@@ -29,7 +29,7 @@
     </div>
     <div id="last">last</div>
   </template>
-  
+
   <script>
   HTMLImports.whenReady(function() {
 
@@ -38,7 +38,7 @@
     var template = document.querySelector('template#v1');
 
     class XBaseV1 extends HTMLElement {
-      
+
       attachedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
@@ -69,7 +69,7 @@
       <footer>footer</footer>
     </div>
   </template>
-  
+
   <script>
   HTMLImports.whenReady(function() {
 
@@ -78,11 +78,11 @@
     var template = document.querySelector('template#v0');
 
     class XBaseV0 extends HTMLElement {
-      
+
       attachedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
-          this.createShadowRoot().appendChild(
+          this.attachShadow({mode:'open'}).appendChild(
             document.importNode(template.content, true));
         }
         var d = document.createElement('div');
diff --git a/test/smoke/template-polymer.html b/test/smoke/template-polymer.html
index 0dce445e2d..46c50621ae 100644
--- a/test/smoke/template-polymer.html
+++ b/test/smoke/template-polymer.html
@@ -16,7 +16,7 @@
   <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
 
   <link rel="import" href="../../polymer.html">
-  
+
 </head>
 <body>
   <template id="x-template">
@@ -37,10 +37,10 @@
     var template = document.querySelector('template#x-template');
     var events = new Polymer.GestureEventListeners();
     var stamper = new Polymer.TemplateStamp(events);
-    
+
 
     class XTemplate extends HTMLElement {
-      
+
       attachedCallback() {
         if (!this.__hasAttached) {
           this.__hasAttached = true;
@@ -48,7 +48,7 @@
           console.log('this.$.content', this.$.content);
           console.log('subTemplate content childNodes should be 1 and is', this.$.subTemplate._content.childNodes.length);
           // attach to dom.
-          this.createShadowRoot().appendChild(dom);
+          this.attachShadow({mode:'open'}).appendChild(dom);
         }
       }
 
@@ -75,7 +75,7 @@
     </template>
     <script>
       Polymer({
-        
+
         is: 'x-polymer-template',
 
         ready: function() {
diff --git a/test/smoke/template.html b/test/smoke/template.html
index 80f53146c2..684cea6e6d 100644
--- a/test/smoke/template.html
+++ b/test/smoke/template.html
@@ -18,7 +18,7 @@
   <link rel="import" href="../../src/events/gesture-event-listeners.html">
   <link rel="import" href="../../src/template/annotations.html">
   <link rel="import" href="../../src/template/template-stamp.html">
-  
+
 </head>
 <body>
   <template id="x-template">
@@ -40,10 +40,10 @@
 
     var events = new Polymer.GestureEventListeners();
     var stamper = new Polymer.TemplateStamp(events);
-    
+
 
     class XTemplate extends HTMLElement {
-      
+
       attachedCallback() {
         if (!this.__hasAttached) {
           this.__hasAttached = true;
@@ -51,7 +51,7 @@
           console.log('this.$.content', this.$.content);
           console.log('subTemplate content childNodes should be 1 and is', this.$.subTemplate._content.childNodes.length);
           // attach to dom.
-          this.createShadowRoot().appendChild(dom);
+          this.attachShadow({mode:'open'}).appendChild(dom);
         }
       }
 
diff --git a/test/smoke/templatizer.html b/test/smoke/templatizer.html
index 36622a9103..7d90347aec 100644
--- a/test/smoke/templatizer.html
+++ b/test/smoke/templatizer.html
@@ -101,7 +101,7 @@
 
       createdCallback() {
         data.prepare(this, function() {
-          this.createShadowRoot().appendChild(data.stamp(this, template));
+          this.attachShadow({mode:'open'}).appendChild(data.stamp(this, template));
         });
         this.prop = 100;
       }
diff --git a/test/smoke/utils.html b/test/smoke/utils.html
index b37b4a257b..ec97c41d72 100644
--- a/test/smoke/utils.html
+++ b/test/smoke/utils.html
@@ -50,7 +50,7 @@
       createdCallback() {
         var dom = templateStamp.stamp(template, this);
         propertyEffects.setupBindings(this, dom, notes);
-        this.createShadowRoot().appendChild(dom);
+        this.attachShadow({mode:'open'}).appendChild(dom);
         //this.attachShadow({mode: 'open'}).appendChild(dom);
 
         this.valAsync0 = 0;
diff --git a/test/unit/styling-cross-scope-unknown-host.html b/test/unit/styling-cross-scope-unknown-host.html
index f59a07e17a..b0e3a9fcca 100644
--- a/test/unit/styling-cross-scope-unknown-host.html
+++ b/test/unit/styling-cross-scope-unknown-host.html
@@ -38,11 +38,7 @@
           this.createdCallback();
         }
         createdCallback() {
-          if (this.attachShadow) {
-            this.attachShadow({mode: 'open'});
-          } else {
-            this.createShadowRoot();
-          }
+          this.attachShadow({mode: 'open'});
         }
       }
       if (window.customElements) {

From 0e2d6218c9d55f5a86b95cb393b927adbf81a44e Mon Sep 17 00:00:00 2001
From: Kevin Schaaf <kschaaf@google.com>
Date: Mon, 22 Aug 2016 10:24:59 -0700
Subject: [PATCH 2/8] Remove document.registerElement()

---
 src/compat/custom-style-container.html          | 12 +++---------
 src/compat/custom-style.html                    |  9 +--------
 src/compat/dom-module.html                      |  6 +-----
 src/compat/polymer-fn.html                      | 10 +++-------
 src/templatizer/dom-bind.html                   |  6 +-----
 test/smoke/attributes-polymer.html              | 14 +++++++-------
 test/smoke/attributes.html                      | 10 +++++-----
 test/smoke/bindings.html                        |  4 ++--
 test/smoke/css-properties.html                  |  2 +-
 test/smoke/data-lazy.html                       |  6 +++---
 test/smoke/data-observers.html                  |  4 ++--
 test/smoke/data-path.html                       |  6 +++---
 test/smoke/data.html                            |  2 +-
 test/smoke/dom-if.html                          |  2 +-
 test/smoke/dom-repeat.html                      |  2 +-
 test/smoke/events-polymer.html                  | 12 ++++++------
 test/smoke/events.html                          |  8 ++++----
 test/smoke/polymer.html                         | 12 ++----------
 test/smoke/properties-invalidate-be.html        |  2 +-
 test/smoke/properties-invalidate-raw.html       |  2 +-
 test/smoke/properties-invalidate-stampino.html  |  2 +-
 test/smoke/properties-invalidate.html           |  2 +-
 test/smoke/properties.html                      |  4 ++--
 test/smoke/shadow-with-css.html                 |  8 ++++----
 test/smoke/shady-slot-observer.html             | 10 +++++-----
 test/smoke/shady-slot.html                      |  8 ++++----
 test/smoke/shady-with-css-dynamic.html          |  8 ++++----
 test/smoke/shady-with-css.html                  |  8 ++++----
 test/smoke/shady.html                           |  4 ++--
 test/smoke/template-polymer.html                |  2 +-
 test/smoke/template.html                        |  2 +-
 test/smoke/templatizer.html                     |  4 ++--
 test/smoke/utils.html                           |  2 +-
 test/smoke/zero.html                            |  4 ++--
 test/unit/styling-cross-scope-unknown-host.html |  2 +-
 35 files changed, 84 insertions(+), 117 deletions(-)

diff --git a/src/compat/custom-style-container.html b/src/compat/custom-style-container.html
index fa51983ae5..eecdbad5db 100644
--- a/src/compat/custom-style-container.html
+++ b/src/compat/custom-style-container.html
@@ -22,7 +22,7 @@
 
     createdCallback() {
       if (!this._acquireStyle()) {
-        this._observeContent();  
+        this._observeContent();
       }
       // TODO(sorvell): initialize elements in imports if necessary
       // (first impl of V1 native custom elements requires this)
@@ -75,7 +75,7 @@
 
     _transform(style) {
       // BREAKME(kschaaf): for short-term bc, but intend to break
-      style.textContent = 
+      style.textContent =
         Polymer.CompatStyleUtil.normalizeCSSTextForBC(style.textContent);
       Polymer.StyleLib.transformForDocument(style);
       enqueueDocumentValidation();
@@ -104,13 +104,7 @@
     documentValidationScheduled = false;
   }
 
-  var name = 'custom-style-container';
-
-  if (window.customElements) {
-    window.customElements.define(name, CustomStyle);
-  } else {
-    CustomStyle = document.registerElement(name, CustomStyle);
-  }
+  window.customElements.define('custom-style-container', CustomStyle);
 
 }());
 </script>
diff --git a/src/compat/custom-style.html b/src/compat/custom-style.html
index 7a40709c32..a6523dd95f 100644
--- a/src/compat/custom-style.html
+++ b/src/compat/custom-style.html
@@ -84,14 +84,7 @@
     documentValidationScheduled = false;
   }
 
-  CustomStyle.extends = 'style';
-  var name = 'custom-style';
-
-  if (window.customElements) {
-    customElements.define(name, CustomStyle);
-  } else {
-    CustomStyle = document.registerElement(name, CustomStyle);
-  }
+  customElements.define('custom-style', CustomStyle, {extends: 'style'});
 
 })();
 </script>
diff --git a/src/compat/dom-module.html b/src/compat/dom-module.html
index a404762950..4cf9c9ac92 100644
--- a/src/compat/dom-module.html
+++ b/src/compat/dom-module.html
@@ -100,11 +100,7 @@
   // NOTE: Safari can't deal with an ES6 style function named `import`
   DomModule.prototype.import = DomModule.prototype.__import;
 
-  if (window.customElements) {
-    customElements.define('dom-module', DomModule);
-  } else {
-    DomModule = document.registerElement('dom-module', DomModule);
-  }
+  customElements.define('dom-module', DomModule);
 
   // NOTE: HTMLImports polyfill does not
   // block scripts on upgrading elements. However, we want to ensure that
diff --git a/src/compat/polymer-fn.html b/src/compat/polymer-fn.html
index 08ec7aa0be..10782a1878 100644
--- a/src/compat/polymer-fn.html
+++ b/src/compat/polymer-fn.html
@@ -33,12 +33,8 @@
       if (klass.extends) {
         options.extends = klass.extends;
       }
-      if (window.customElements) {
-        customElements.define(klass.is, klass, options);
-        return klass;
-      } else {
-        return document.registerElement(klass.prototype.is, klass);
-      }
+      customElements.define(klass.is, klass, options);
+      return klass;
     };
 
     if (userPolymer) {
@@ -48,7 +44,7 @@
     }
 
     // TODO(sorvel): ad hoc settings...
-    Polymer.shadowDomV0 = Polymer.shadowDomV0 || 
+    Polymer.shadowDomV0 = Polymer.shadowDomV0 ||
       (location.search.indexOf('shadowDomV0=true') >= 0);
 
   })();
diff --git a/src/templatizer/dom-bind.html b/src/templatizer/dom-bind.html
index ad68bb4bae..00d7ea419e 100644
--- a/src/templatizer/dom-bind.html
+++ b/src/templatizer/dom-bind.html
@@ -74,11 +74,7 @@
 
     }
 
-    if (window.customElements) {
-      customElements.define('dom-bind', DomBind);
-    } else {
-      DomBind = document.registerElement('dom-bind', DomBind);
-    }
+    customElements.define('dom-bind', DomBind);
 
   })();
 
diff --git a/test/smoke/attributes-polymer.html b/test/smoke/attributes-polymer.html
index 87d16e691c..367b02c525 100644
--- a/test/smoke/attributes-polymer.html
+++ b/test/smoke/attributes-polymer.html
@@ -16,16 +16,16 @@
   <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
 
   <link rel="import" href="../../polymer.html">
-  
+
   <script>
   (function() {
 
     'use strict';
-    
+
     var attributes = new Polymer.AttributeToProperty();
 
     class XBase extends HTMLElement {
-      
+
       createdCallback() {
         this.textContent = 'hello world';
         attributes.simulateV1AttributeCallbacks(this);
@@ -44,17 +44,17 @@
     }
 
     XBase.observedAttributes = {
-      pull: true, 
+      pull: true,
       attr: true
     };
 
-    document.registerElement('x-base', XBase);
+    customElements.define('x-base', XBase);
 
     // *********************
 
     // working up to this...
     Polymer({
-      
+
       is: 'x-polymer',
 
       hostAttributes: {
@@ -64,7 +64,7 @@
       properties: {
         pull: {type: String}
       },
-      
+
       ready: function() {
         this.textContent = this.localName;
         console.log('attribute set to property: pull is', this.pull);
diff --git a/test/smoke/attributes.html b/test/smoke/attributes.html
index 9e037b4887..aff4760c0d 100644
--- a/test/smoke/attributes.html
+++ b/test/smoke/attributes.html
@@ -16,16 +16,16 @@
   <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
 
   <link rel="import" href="../../src/attributes/attribute-to-property.html">
-  
+
   <script>
   (function() {
 
     'use strict';
 
     var attributes = new Polymer.AttributeToProperty();
-    
+
     class XBase extends HTMLElement {
-      
+
       createdCallback() {
         this.textContent = 'hello world';
         attributes.simulateV1AttributeCallbacks(this);
@@ -44,11 +44,11 @@
     }
 
     XBase.observedAttributes = {
-      pull: true, 
+      pull: true,
       attr: true
     };
 
-    document.registerElement('x-base', XBase);
+    customElements.define('x-base', XBase);
 
   })();
   </script>
diff --git a/test/smoke/bindings.html b/test/smoke/bindings.html
index fa1a57c064..5c20fd4a84 100644
--- a/test/smoke/bindings.html
+++ b/test/smoke/bindings.html
@@ -78,7 +78,7 @@
 
     propertyEffects.bindTemplate(XBindings, template);
 
-    document.registerElement('x-bindings', XBindings);
+    customElements.define('x-bindings', XBindings);
 
     ///////////////
 
@@ -99,7 +99,7 @@
     propertyEffects.createNotifyingProperty(XClient, 'prop');
     propertyEffects.bindTemplate(XClient, clientTemplate);
 
-    document.registerElement('x-client', XClient);
+    customElements.define('x-client', XClient);
 
   })();
   </script>
diff --git a/test/smoke/css-properties.html b/test/smoke/css-properties.html
index 61cec2df2b..ac6bfd0baf 100644
--- a/test/smoke/css-properties.html
+++ b/test/smoke/css-properties.html
@@ -105,6 +105,6 @@
 XFoo.prototype.is = 'x-foo';
 XFoo.prototype.mixin = Polymer.Utils.mixin;
 
-document.registerElement('x-foo', XFoo);
+customElements.define('x-foo', XFoo);
 document.body.appendChild(document.createElement('x-foo'));
 </script>
diff --git a/test/smoke/data-lazy.html b/test/smoke/data-lazy.html
index 76194ab0a4..eab50b8a39 100644
--- a/test/smoke/data-lazy.html
+++ b/test/smoke/data-lazy.html
@@ -165,7 +165,7 @@
 
     }
 
-    document.registerElement('x-properties', XProperties);
+    customElements.define('x-properties', XProperties);
 
     // ---------------
 
@@ -247,7 +247,7 @@
 
     }
 
-    document.registerElement('x-client', XClient);
+    customElements.define('x-client', XClient);
 
     // ---------------
 
@@ -274,7 +274,7 @@
     data.createObserver(XPropertiesSub, 'foo',
       'fooChanged2');
 
-    document.registerElement('x-properties-sub', XPropertiesSub);
+    customElements.define('x-properties-sub', XPropertiesSub);
 
   })();
   </script>
diff --git a/test/smoke/data-observers.html b/test/smoke/data-observers.html
index e85ed0a8ea..8da5dd6940 100644
--- a/test/smoke/data-observers.html
+++ b/test/smoke/data-observers.html
@@ -79,7 +79,7 @@
     data.createObserver(XHost, 'prop2', '_prop2Changed');
     data.createObserver(XHost, 'prop3', '_prop3Changed');
     data.bindTemplate(XHost, hostTemplate);
-    document.registerElement('x-host', XHost);
+    customElements.define('x-host', XHost);
 
     // ---------------
 
@@ -106,7 +106,7 @@
     data.createObserver(XClient, 'prop2', '_prop2Changed');
     data.createObserver(XClient, 'prop3', '_prop3Changed');
     data.bindTemplate(XClient, clientTemplate);
-    document.registerElement('x-client', XClient);
+    customElements.define('x-client', XClient);
   })();
   </script>
 
diff --git a/test/smoke/data-path.html b/test/smoke/data-path.html
index b054df516e..862c782b6a 100644
--- a/test/smoke/data-path.html
+++ b/test/smoke/data-path.html
@@ -93,7 +93,7 @@
       }
     }
     data.bindTemplate(XObj, objTemplate);
-    document.registerElement('x-obj', XObj);
+    customElements.define('x-obj', XObj);
 
     var propTemplate = document.querySelector('template#x-prop');
     class XProp extends HTMLElement {
@@ -114,7 +114,7 @@
     }
     data.bindTemplate(XProp, propTemplate);
     data.createNotifyingProperty(XProp, 'prop');
-    document.registerElement('x-prop', XProp);
+    customElements.define('x-prop', XProp);
 
     var hostTemplate = document.querySelector('template#x-host');
     class XHost extends HTMLElement {
@@ -142,7 +142,7 @@
       }
     }
     data.bindTemplate(XHost, hostTemplate);
-    document.registerElement('x-host', XHost);
+    customElements.define('x-host', XHost);
 
 
   })();
diff --git a/test/smoke/data.html b/test/smoke/data.html
index d1f1655eb6..d4c3f85dee 100644
--- a/test/smoke/data.html
+++ b/test/smoke/data.html
@@ -160,7 +160,7 @@
 
     data.bindTemplate(XHost, template);
 
-    document.registerElement('x-host', XHost);
+    customElements.define('x-host', XHost);
 
     // ---------------
 
diff --git a/test/smoke/dom-if.html b/test/smoke/dom-if.html
index 3ec6480c0d..ce02573d98 100644
--- a/test/smoke/dom-if.html
+++ b/test/smoke/dom-if.html
@@ -50,7 +50,7 @@
 
     data.bindTemplate(XHost, template);
 
-    document.registerElement('x-host', XHost);
+    customElements.define('x-host', XHost);
   </script>
 
   <x-host></x-host>
diff --git a/test/smoke/dom-repeat.html b/test/smoke/dom-repeat.html
index da165398a1..677831e242 100644
--- a/test/smoke/dom-repeat.html
+++ b/test/smoke/dom-repeat.html
@@ -60,7 +60,7 @@
 
       data.bindTemplate(XHost, template);
 
-      document.registerElement('x-host', XHost);
+      customElements.define('x-host', XHost);
     });
   </script>
 
diff --git a/test/smoke/events-polymer.html b/test/smoke/events-polymer.html
index c5a0a6a146..2e5c262799 100644
--- a/test/smoke/events-polymer.html
+++ b/test/smoke/events-polymer.html
@@ -21,9 +21,9 @@
     'use strict';
 
     var Events = new Polymer.GestureEventListeners();
-    
+
     class XBase extends HTMLElement {
-      
+
       createdCallback() {
         this.textContent = this.localName;
         Events.addMethodListener(this, 'tap', '_tap');
@@ -35,19 +35,19 @@
 
     }
 
-    document.registerElement('x-base', XBase);
+    customElements.define('x-base', XBase);
 
     // *********************
 
     // working up to this...
     Polymer({
-      
+
       is: 'x-polymer',
 
       listeners: {
         tap: '_tap'
       },
-      
+
       created: function() {
         this.textContent = this.localName;
         this.listen(this, 'custom', '_custom');
@@ -63,7 +63,7 @@
       }
 
     });
-    
+
   })();
   </script>
 </head>
diff --git a/test/smoke/events.html b/test/smoke/events.html
index 72dc616d93..f68f7e55b8 100644
--- a/test/smoke/events.html
+++ b/test/smoke/events.html
@@ -17,15 +17,15 @@
 
   <link rel="import" href="../../src/utils/boot.html">
   <link rel="import" href="../../src/events/gesture-event-listeners.html">
-  
+
   <script>
   (function() {
     'use strict';
 
     var Events = new Polymer.GestureEventListeners();
-    
+
     class XBase extends HTMLElement {
-      
+
       createdCallback() {
         this.textContent = 'hello world';
         Events.addMethodListener(this, 'down', '_logEvent');
@@ -45,7 +45,7 @@
 
     }
 
-    document.registerElement('x-base', XBase);
+    customElements.define('x-base', XBase);
 
   })();
   </script>
diff --git a/test/smoke/polymer.html b/test/smoke/polymer.html
index 656bbe4378..16b2479063 100644
--- a/test/smoke/polymer.html
+++ b/test/smoke/polymer.html
@@ -38,11 +38,7 @@
 
     };
 
-    if (window.customElements) {
-      customElements.define('x-base', XBase);
-    } else {
-      XBase = document.registerElement('x-base', XBase);
-    }
+    customElements.define('x-base', XBase);
 
     class XExtend extends XBase {
 
@@ -62,11 +58,7 @@
 
     };
 
-    if (window.customElements) {
-      customElements.define('x-extend', XExtend);
-    } else {
-      XExtend = document.registerElement('x-extend', XExtend);
-    }
+    customElements.define('x-extend', XExtend);
 
     // *********************
 
diff --git a/test/smoke/properties-invalidate-be.html b/test/smoke/properties-invalidate-be.html
index dcbe71a594..3dbdfa335c 100644
--- a/test/smoke/properties-invalidate-be.html
+++ b/test/smoke/properties-invalidate-be.html
@@ -74,7 +74,7 @@
     class XTestDom {};
     data.bindTemplate(XTestDom, template);
 
-    document.registerElement('x-test', XTest);
+    customElements.define('x-test', XTest);
 
   })();
   </script>
diff --git a/test/smoke/properties-invalidate-raw.html b/test/smoke/properties-invalidate-raw.html
index 0d6b614603..08259eaec1 100644
--- a/test/smoke/properties-invalidate-raw.html
+++ b/test/smoke/properties-invalidate-raw.html
@@ -70,7 +70,7 @@
 
     accessors.createAcessorsForAttributes(XTest);
 
-    document.registerElement('x-test', XTest);
+    customElements.define('x-test', XTest);
 
   })();
   </script>
diff --git a/test/smoke/properties-invalidate-stampino.html b/test/smoke/properties-invalidate-stampino.html
index 79d7aa98c2..b423b355c7 100644
--- a/test/smoke/properties-invalidate-stampino.html
+++ b/test/smoke/properties-invalidate-stampino.html
@@ -75,7 +75,7 @@
     class XTestDom {};
     data.bindTemplate(XTestDom, template);
 
-    document.registerElement('x-test', XTest);
+    customElements.define('x-test', XTest);
 
   })();
   </script>
diff --git a/test/smoke/properties-invalidate.html b/test/smoke/properties-invalidate.html
index c8df1e39f9..e0c18207ca 100644
--- a/test/smoke/properties-invalidate.html
+++ b/test/smoke/properties-invalidate.html
@@ -53,7 +53,7 @@
 
     accessors.createAcessorsForAttributes(XTest);
 
-    document.registerElement('x-test', XTest);
+    customElements.define('x-test', XTest);
 
   })();
   </script>
diff --git a/test/smoke/properties.html b/test/smoke/properties.html
index 699cdd68c4..7bc0d1b777 100644
--- a/test/smoke/properties.html
+++ b/test/smoke/properties.html
@@ -105,7 +105,7 @@
 
     // Polymer.Bindings.createBindings(XProperties, notes);
 
-    document.registerElement('x-properties', XProperties);
+    customElements.define('x-properties', XProperties);
 
     // ---------------
 
@@ -132,7 +132,7 @@
     PropertyEffects.createObserver(XPropertiesSub, 'foo',
       'fooChanged2');
 
-    document.registerElement('x-properties-sub', XPropertiesSub);
+    customElements.define('x-properties-sub', XPropertiesSub);
 
   })();
   </script>
diff --git a/test/smoke/shadow-with-css.html b/test/smoke/shadow-with-css.html
index 423b6e0f38..821367bba0 100644
--- a/test/smoke/shadow-with-css.html
+++ b/test/smoke/shadow-with-css.html
@@ -75,7 +75,7 @@
 
     }
 
-    document.registerElement('x-base-v1', XBaseV1);
+    customElements.define('x-base-v1', XBaseV1);
   });
 
   </script>
@@ -112,7 +112,7 @@
 
     }
 
-    document.registerElement('x-base-v0', XBaseV0);
+    customElements.define('x-base-v0', XBaseV0);
 
   });
 
@@ -154,7 +154,7 @@
         }
       }
     }
-    document.registerElement('x-child', XChild);
+    customElements.define('x-child', XChild);
   });
   </script>
   <template id="x-parent">
@@ -188,7 +188,7 @@
         }
       }
     }
-    document.registerElement('x-parent', XParent);
+    customElements.define('x-parent', XParent);
   });
   </script>
 
diff --git a/test/smoke/shady-slot-observer.html b/test/smoke/shady-slot-observer.html
index 189271fc44..8f1a7423bf 100644
--- a/test/smoke/shady-slot-observer.html
+++ b/test/smoke/shady-slot-observer.html
@@ -34,7 +34,7 @@
     </div>
     <div id="last">last</div>
   </template>
-  
+
   <script>
   HTMLImports.whenReady(function() {
 
@@ -43,7 +43,7 @@
     var template = document.querySelector('template#v1');
 
     class XBaseV1 extends HTMLElement {
-      
+
       attachedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
@@ -53,7 +53,7 @@
         this._slotListener = function(e) {
           console.log(e.type, e.target, 'assignedNodes', e.target.assignedNodes());
         }
-        this.shadowRoot.querySelector('slot').addEventListener('slotchange', 
+        this.shadowRoot.querySelector('slot').addEventListener('slotchange',
           this._slotListener);
         var d = document.createElement('div');
         d.setAttribute('slot', 'b');
@@ -63,7 +63,7 @@
 
     }
 
-    document.registerElement('x-base-v1', XBaseV1);
+    customElements.define('x-base-v1', XBaseV1);
 
   });
 
@@ -74,7 +74,7 @@
   </x-base-v1>
 
   <script>
-    
+
     function filterMutations(mxns, target) {
       return mxns.filter(function(mxn) {
         Polymer.ShadyDom.patch(mxn.target);
diff --git a/test/smoke/shady-slot.html b/test/smoke/shady-slot.html
index 6987b5bdd9..3bdeb4197b 100644
--- a/test/smoke/shady-slot.html
+++ b/test/smoke/shady-slot.html
@@ -34,7 +34,7 @@
     </div>
     <div id="last">last</div>
   </template>
-  
+
   <script>
   HTMLImports.whenReady(function() {
 
@@ -43,7 +43,7 @@
     var template = document.querySelector('template#v1');
 
     class XBaseV1 extends HTMLElement {
-      
+
       attachedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
@@ -58,7 +58,7 @@
 
     }
 
-    document.registerElement('x-base-v1', XBaseV1);
+    customElements.define('x-base-v1', XBaseV1);
 
   });
 
@@ -73,7 +73,7 @@
       <footer>footer</footer>
     </div>
   </template>
-  
+
   <x-base-v1 id="test">
     <div slot="a">light child</div>
   </x-base-v1>
diff --git a/test/smoke/shady-with-css-dynamic.html b/test/smoke/shady-with-css-dynamic.html
index ab2d84e21c..942eb629a2 100644
--- a/test/smoke/shady-with-css-dynamic.html
+++ b/test/smoke/shady-with-css-dynamic.html
@@ -89,7 +89,7 @@
       Polymer.StyleTransformer.dom(node, root.host.localName, true);
     }
 
-    document.registerElement('x-base-v1', XBaseV1);
+    customElements.define('x-base-v1', XBaseV1);
 
     //Polymer.DomTreeMutation.patch(test);
 
@@ -129,7 +129,7 @@
 
     }
 
-    document.registerElement('x-base-v0', XBaseV0);
+    customElements.define('x-base-v0', XBaseV0);
 
   });
 
@@ -171,7 +171,7 @@
         }
       }
     }
-    document.registerElement('x-child', XChild);
+    customElements.define('x-child', XChild);
   });
   </script>
   <template id="x-parent">
@@ -205,7 +205,7 @@
         }
       }
     }
-    document.registerElement('x-parent', XParent);
+    customElements.define('x-parent', XParent);
   });
   </script>
 
diff --git a/test/smoke/shady-with-css.html b/test/smoke/shady-with-css.html
index 65258bc55c..6521a04b74 100644
--- a/test/smoke/shady-with-css.html
+++ b/test/smoke/shady-with-css.html
@@ -76,7 +76,7 @@
 
     }
 
-    document.registerElement('x-base-v1', XBaseV1);
+    customElements.define('x-base-v1', XBaseV1);
 
   });
 
@@ -114,7 +114,7 @@
 
     }
 
-    document.registerElement('x-base-v0', XBaseV0);
+    customElements.define('x-base-v0', XBaseV0);
 
   });
 
@@ -156,7 +156,7 @@
         }
       }
     }
-    document.registerElement('x-child', XChild);
+    customElements.define('x-child', XChild);
   });
   </script>
   <template id="x-parent">
@@ -190,7 +190,7 @@
         }
       }
     }
-    document.registerElement('x-parent', XParent);
+    customElements.define('x-parent', XParent);
   });
   </script>
 
diff --git a/test/smoke/shady.html b/test/smoke/shady.html
index fc764b865e..ee5a8b111a 100644
--- a/test/smoke/shady.html
+++ b/test/smoke/shady.html
@@ -52,7 +52,7 @@
 
     }
 
-    document.registerElement('x-base-v1', XBaseV1);
+    customElements.define('x-base-v1', XBaseV1);
 
     //Polymer.DomTreeMutation.patch(test);
 
@@ -92,7 +92,7 @@
 
     }
 
-    document.registerElement('x-base-v0', XBaseV0);
+    customElements.define('x-base-v0', XBaseV0);
 
   });
 
diff --git a/test/smoke/template-polymer.html b/test/smoke/template-polymer.html
index 46c50621ae..9b9e7bcc49 100644
--- a/test/smoke/template-polymer.html
+++ b/test/smoke/template-polymer.html
@@ -57,7 +57,7 @@
       }
     }
 
-    document.registerElement('x-template', XTemplate);
+    customElements.define('x-template', XTemplate);
   })();
   </script>
 
diff --git a/test/smoke/template.html b/test/smoke/template.html
index 684cea6e6d..8e4032a6db 100644
--- a/test/smoke/template.html
+++ b/test/smoke/template.html
@@ -60,7 +60,7 @@
       }
     }
 
-    document.registerElement('x-template', XTemplate);
+    customElements.define('x-template', XTemplate);
   })();
   </script>
 
diff --git a/test/smoke/templatizer.html b/test/smoke/templatizer.html
index 7d90347aec..6a0cad0b6b 100644
--- a/test/smoke/templatizer.html
+++ b/test/smoke/templatizer.html
@@ -66,7 +66,7 @@
 
     }
 
-    document.registerElement('x-templatizer', XTemplatizer);
+    customElements.define('x-templatizer', XTemplatizer);
 
   })();
 
@@ -125,7 +125,7 @@
     }
 
     data.bindTemplate(XHost, template);
-    document.registerElement('x-host', XHost);
+    customElements.define('x-host', XHost);
 
   })();
   </script>
diff --git a/test/smoke/utils.html b/test/smoke/utils.html
index ec97c41d72..b9c63315e1 100644
--- a/test/smoke/utils.html
+++ b/test/smoke/utils.html
@@ -103,7 +103,7 @@
 
     propertyEffects.bindTemplate(XUtils, template);
 
-    document.registerElement('x-utils', XUtils);
+    customElements.define('x-utils', XUtils);
   })();
   </script>
 </head>
diff --git a/test/smoke/zero.html b/test/smoke/zero.html
index fb9b42720f..0c977aa17c 100644
--- a/test/smoke/zero.html
+++ b/test/smoke/zero.html
@@ -14,7 +14,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
-  
+
   <script>
   'use strict';
 
@@ -24,7 +24,7 @@
     }
   };
 
-  document.registerElement('x-base', XBase);
+  customElements.define('x-base', XBase);
   </script>
 </head>
 <body>
diff --git a/test/unit/styling-cross-scope-unknown-host.html b/test/unit/styling-cross-scope-unknown-host.html
index b0e3a9fcca..e5b06e871c 100644
--- a/test/unit/styling-cross-scope-unknown-host.html
+++ b/test/unit/styling-cross-scope-unknown-host.html
@@ -44,7 +44,7 @@
       if (window.customElements) {
         window.customElements.define('unknown-host', UnknownHost);
       } else {
-        document.registerElement('unknown-host', UnknownHost);
+        customElements.define('unknown-host', UnknownHost);
       }
     });
   </script>

From 35bd45923e9ff3d4202a20f7e7a004381254deb0 Mon Sep 17 00:00:00 2001
From: Kevin Schaaf <kschaaf@google.com>
Date: Mon, 22 Aug 2016 10:28:35 -0700
Subject: [PATCH 3/8] Remove simulateV1AttributeCallbacks()

---
 src/attributes/attribute-to-property.html      | 15 ---------------
 test/smoke/attributes-polymer.html             |  1 -
 test/smoke/attributes.html                     |  4 +---
 test/smoke/data-lazy.html                      |  8 ++------
 test/smoke/data.html                           |  4 +---
 test/smoke/properties-invalidate-be.html       |  4 +---
 test/smoke/properties-invalidate-raw.html      |  4 +---
 test/smoke/properties-invalidate-stampino.html |  4 +---
 test/smoke/properties-invalidate.html          |  4 +---
 9 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/src/attributes/attribute-to-property.html b/src/attributes/attribute-to-property.html
index 812140e82b..2895d86855 100644
--- a/src/attributes/attribute-to-property.html
+++ b/src/attributes/attribute-to-property.html
@@ -30,21 +30,6 @@
       }
     }
 
-    // temporary code for simulating CE v1 attribute callbacks
-    simulateV1AttributeCallbacks(inst) {
-      if (!window.customElements) {
-        var attrs = inst.constructor.observedAttributes;
-        if (attrs) {
-          for (var i=0; i<attrs.length; i++) {
-            var attr = attrs[i];
-            if (inst.hasAttribute(attr)) {
-              inst.attributeChangedCallback(attr, null, inst.getAttribute(attr));
-            }
-          }
-        }
-      }
-    }
-
     /**
      * Converts a string to a typed value.
      *
diff --git a/test/smoke/attributes-polymer.html b/test/smoke/attributes-polymer.html
index 367b02c525..dbcf81845a 100644
--- a/test/smoke/attributes-polymer.html
+++ b/test/smoke/attributes-polymer.html
@@ -28,7 +28,6 @@
 
       createdCallback() {
         this.textContent = 'hello world';
-        attributes.simulateV1AttributeCallbacks(this);
         // test attributeChanged
         this.setAttribute('attr', 'attr');
         console.log('attributeToProperty: pull is', this.pull);
diff --git a/test/smoke/attributes.html b/test/smoke/attributes.html
index aff4760c0d..ba8b990f47 100644
--- a/test/smoke/attributes.html
+++ b/test/smoke/attributes.html
@@ -27,9 +27,7 @@
     class XBase extends HTMLElement {
 
       createdCallback() {
-        this.textContent = 'hello world';
-        attributes.simulateV1AttributeCallbacks(this);
-        // test attributeChanged
+        this.textContent = 'hello world';        // test attributeChanged
         this.setAttribute('attr', 'attr');
         console.log('attributeToProperty: pull is', this.pull);
       }
diff --git a/test/smoke/data-lazy.html b/test/smoke/data-lazy.html
index eab50b8a39..a3cdbeaa32 100644
--- a/test/smoke/data-lazy.html
+++ b/test/smoke/data-lazy.html
@@ -118,9 +118,7 @@
           });
         }
         this.foo = 'foo';
-        this._setZiz('ziz');
-        attributes.simulateV1AttributeCallbacks(this);
-      }
+        this._setZiz('ziz');      }
 
       attributeChangedCallback(name, old, value) {
         attributes.attributeToProperty(this, name, value);
@@ -200,9 +198,7 @@
         }
         this.foo = 'foo';
         this.ziz = 'ziz';
-        this.bar = 'bar';
-        attributes.simulateV1AttributeCallbacks(this);
-      }
+        this.bar = 'bar';      }
 
       attributeChangedCallback(name, old, value) {
         attributes.attributeToProperty(this, name, value);
diff --git a/test/smoke/data.html b/test/smoke/data.html
index d4c3f85dee..43c221ed98 100644
--- a/test/smoke/data.html
+++ b/test/smoke/data.html
@@ -89,9 +89,7 @@
         });
         this.foo = 'foo';
         this.ziz = 'ziz';
-        // this._setZiz('ziz');
-        attributes.simulateV1AttributeCallbacks(this);
-      }
+        // this._setZiz('ziz');      }
 
       connectedCallback() {
         this.attachedCallback();
diff --git a/test/smoke/properties-invalidate-be.html b/test/smoke/properties-invalidate-be.html
index 3dbdfa335c..15b558a71c 100644
--- a/test/smoke/properties-invalidate-be.html
+++ b/test/smoke/properties-invalidate-be.html
@@ -52,9 +52,7 @@
         attributes.attributeToProperty(this, name, value);
       }
 
-      createdCallback() {
-        attributes.simulateV1AttributeCallbacks(this);
-        this.dom = new XTestDom();
+      createdCallback() {        this.dom = new XTestDom();
         this.attachShadow({mode:'open'}).appendChild(data.stamp(template, this.dom));
         data.enablePropertyEffects(this.dom);
       }
diff --git a/test/smoke/properties-invalidate-raw.html b/test/smoke/properties-invalidate-raw.html
index 08259eaec1..f11770e7c6 100644
--- a/test/smoke/properties-invalidate-raw.html
+++ b/test/smoke/properties-invalidate-raw.html
@@ -48,9 +48,7 @@
         attributes.attributeToProperty(this, name, value);
       }
 
-      createdCallback() {
-        attributes.simulateV1AttributeCallbacks(this);
-        this.attachShadow({mode:'open'}).appendChild(document.importNode(template.content, true));
+      createdCallback() {        this.attachShadow({mode:'open'}).appendChild(document.importNode(template.content, true));
       }
 
       validate(props, oldProps, changedProps) {
diff --git a/test/smoke/properties-invalidate-stampino.html b/test/smoke/properties-invalidate-stampino.html
index b423b355c7..6b3923246b 100644
--- a/test/smoke/properties-invalidate-stampino.html
+++ b/test/smoke/properties-invalidate-stampino.html
@@ -53,9 +53,7 @@
         attributes.attributeToProperty(this, name, value);
       }
 
-      createdCallback() {
-        attributes.simulateV1AttributeCallbacks(this);
-        this.dom = new XTestDom();
+      createdCallback() {        this.dom = new XTestDom();
         this.attachShadow({mode:'open'}).appendChild(data.stamp(template, this.dom));
         data.enablePropertyEffects(this.dom);
       }
diff --git a/test/smoke/properties-invalidate.html b/test/smoke/properties-invalidate.html
index e0c18207ca..339696b43d 100644
--- a/test/smoke/properties-invalidate.html
+++ b/test/smoke/properties-invalidate.html
@@ -41,9 +41,7 @@
         attributes.attributeToProperty(this, name, value);
       }
 
-      createdCallback() {
-        attributes.simulateV1AttributeCallbacks(this);
-      }
+      createdCallback() {      }
 
       validate(props, oldProps, changedProps) {
         console.info(props, oldProps, changedProps);

From 8a57eaee3bb8c0c98c76c04ed14d38cab2305589 Mon Sep 17 00:00:00 2001
From: Kevin Schaaf <kschaaf@google.com>
Date: Tue, 23 Aug 2016 09:29:43 -0700
Subject: [PATCH 4/8] Fix formatting.

---
 test/smoke/data-lazy.html                      | 3 ++-
 test/smoke/data.html                           | 3 ++-
 test/smoke/properties-invalidate-be.html       | 3 ++-
 test/smoke/properties-invalidate-raw.html      | 4 +++-
 test/smoke/properties-invalidate-stampino.html | 3 ++-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/test/smoke/data-lazy.html b/test/smoke/data-lazy.html
index a3cdbeaa32..dca3662788 100644
--- a/test/smoke/data-lazy.html
+++ b/test/smoke/data-lazy.html
@@ -118,7 +118,8 @@
           });
         }
         this.foo = 'foo';
-        this._setZiz('ziz');      }
+        this._setZiz('ziz');
+      }
 
       attributeChangedCallback(name, old, value) {
         attributes.attributeToProperty(this, name, value);
diff --git a/test/smoke/data.html b/test/smoke/data.html
index 43c221ed98..b386598983 100644
--- a/test/smoke/data.html
+++ b/test/smoke/data.html
@@ -89,7 +89,8 @@
         });
         this.foo = 'foo';
         this.ziz = 'ziz';
-        // this._setZiz('ziz');      }
+        // this._setZiz('ziz');
+      }
 
       connectedCallback() {
         this.attachedCallback();
diff --git a/test/smoke/properties-invalidate-be.html b/test/smoke/properties-invalidate-be.html
index 15b558a71c..bca2de1b4d 100644
--- a/test/smoke/properties-invalidate-be.html
+++ b/test/smoke/properties-invalidate-be.html
@@ -52,7 +52,8 @@
         attributes.attributeToProperty(this, name, value);
       }
 
-      createdCallback() {        this.dom = new XTestDom();
+      createdCallback() {
+        this.dom = new XTestDom();
         this.attachShadow({mode:'open'}).appendChild(data.stamp(template, this.dom));
         data.enablePropertyEffects(this.dom);
       }
diff --git a/test/smoke/properties-invalidate-raw.html b/test/smoke/properties-invalidate-raw.html
index f11770e7c6..73f787b400 100644
--- a/test/smoke/properties-invalidate-raw.html
+++ b/test/smoke/properties-invalidate-raw.html
@@ -48,7 +48,9 @@
         attributes.attributeToProperty(this, name, value);
       }
 
-      createdCallback() {        this.attachShadow({mode:'open'}).appendChild(document.importNode(template.content, true));
+      createdCallback() {
+        this.attachShadow({mode:'open'}).appendChild(
+          document.importNode(template.content, true));
       }
 
       validate(props, oldProps, changedProps) {
diff --git a/test/smoke/properties-invalidate-stampino.html b/test/smoke/properties-invalidate-stampino.html
index 6b3923246b..d1d8e31f05 100644
--- a/test/smoke/properties-invalidate-stampino.html
+++ b/test/smoke/properties-invalidate-stampino.html
@@ -53,7 +53,8 @@
         attributes.attributeToProperty(this, name, value);
       }
 
-      createdCallback() {        this.dom = new XTestDom();
+      createdCallback() {
+        this.dom = new XTestDom();
         this.attachShadow({mode:'open'}).appendChild(data.stamp(template, this.dom));
         data.enablePropertyEffects(this.dom);
       }

From aefb31f1ada2bdd0f7ced0aa27b1675e4bde7435 Mon Sep 17 00:00:00 2001
From: Kevin Schaaf <kschaaf@google.com>
Date: Tue, 23 Aug 2016 10:32:59 -0700
Subject: [PATCH 5/8] Change V0 callbacks to V1.

---
 src/compat/custom-style-container.html        |  4 -
 src/compat/custom-style.html                  |  4 -
 src/compat/dom-module.html                    |  4 -
 src/templatizer/dom-bind.html                 |  8 --
 test/smoke/attributes-polymer.html            |  3 +-
 test/smoke/attributes.html                    |  3 +-
 test/smoke/bindings.html                      |  6 +-
 test/smoke/cev1.html                          | 92 -------------------
 test/smoke/css-properties.html                |  3 +-
 test/smoke/data-lazy.html                     | 26 ++----
 test/smoke/data-observers.html                |  6 +-
 test/smoke/data-path.html                     | 21 +----
 test/smoke/data.html                          | 23 +----
 test/smoke/dom-if.html                        |  7 +-
 test/smoke/dom-repeat.html                    |  7 +-
 test/smoke/events-polymer.html                |  3 +-
 test/smoke/events.html                        |  3 +-
 test/smoke/polymer.html                       |  9 --
 test/smoke/properties-invalidate-be.html      |  5 +-
 test/smoke/properties-invalidate-raw.html     |  5 +-
 .../smoke/properties-invalidate-stampino.html |  5 +-
 test/smoke/properties-invalidate.html         |  4 +-
 test/smoke/properties.html                    |  9 +-
 test/smoke/shadow-with-css.html               |  8 +-
 test/smoke/shady-slot-observer.html           |  2 +-
 test/smoke/shady-slot.html                    |  2 +-
 test/smoke/shady-with-css-dynamic.html        |  8 +-
 test/smoke/shady-with-css.html                |  8 +-
 test/smoke/shady.html                         |  4 +-
 test/smoke/template-polymer.html              |  2 +-
 test/smoke/template.html                      |  2 +-
 test/smoke/templatizer.html                   | 17 +---
 test/smoke/utils.html                         |  3 +-
 test/smoke/zero.html                          |  3 +-
 test/unit/notify-path.html                    | 11 +--
 .../styling-cross-scope-unknown-host.html     |  3 -
 36 files changed, 70 insertions(+), 263 deletions(-)
 delete mode 100644 test/smoke/cev1.html

diff --git a/src/compat/custom-style-container.html b/src/compat/custom-style-container.html
index eecdbad5db..e9f3bb1357 100644
--- a/src/compat/custom-style-container.html
+++ b/src/compat/custom-style-container.html
@@ -17,10 +17,6 @@
 
     constructor() {
       super();
-      this.createdCallback();
-    }
-
-    createdCallback() {
       if (!this._acquireStyle()) {
         this._observeContent();
       }
diff --git a/src/compat/custom-style.html b/src/compat/custom-style.html
index a6523dd95f..9cbd0aef55 100644
--- a/src/compat/custom-style.html
+++ b/src/compat/custom-style.html
@@ -16,10 +16,6 @@
 
     constructor() {
       super();
-      this.createdCallback();
-    }
-
-    createdCallback() {
       var e = this.__appliedElement = (this.__appliedElement || this);
       this._initialize(e);
       // TODO(sorvell): initialize elements in imports if necessary
diff --git a/src/compat/dom-module.html b/src/compat/dom-module.html
index 4cf9c9ac92..dfd5dc04ee 100644
--- a/src/compat/dom-module.html
+++ b/src/compat/dom-module.html
@@ -31,10 +31,6 @@
       this.register();
     }
 
-    createdCallback() {
-      this.register();
-    }
-
     // BREAKME(dfreedm)
     _styleOutsideTemplateCheck() {
       if (this.querySelector('style')) {
diff --git a/src/templatizer/dom-bind.html b/src/templatizer/dom-bind.html
index 00d7ea419e..79932a5d99 100644
--- a/src/templatizer/dom-bind.html
+++ b/src/templatizer/dom-bind.html
@@ -23,18 +23,10 @@
     class DomBind extends data.extendWithAPI(HTMLElement) {
 
       connectedCallback() {
-        this.attachedCallback();
-      }
-
-      attachedCallback() {
         this.render();
       }
 
       disconnectedCallback() {
-        this.detachedCallback();
-      }
-
-      detachedCallback() {
         this._removeChildren();
       }
 
diff --git a/test/smoke/attributes-polymer.html b/test/smoke/attributes-polymer.html
index dbcf81845a..09275a1222 100644
--- a/test/smoke/attributes-polymer.html
+++ b/test/smoke/attributes-polymer.html
@@ -26,7 +26,8 @@
 
     class XBase extends HTMLElement {
 
-      createdCallback() {
+      constructor() {
+        super();
         this.textContent = 'hello world';
         // test attributeChanged
         this.setAttribute('attr', 'attr');
diff --git a/test/smoke/attributes.html b/test/smoke/attributes.html
index ba8b990f47..c3c3c69cb8 100644
--- a/test/smoke/attributes.html
+++ b/test/smoke/attributes.html
@@ -26,7 +26,8 @@
 
     class XBase extends HTMLElement {
 
-      createdCallback() {
+      constructor() {
+        super();
         this.textContent = 'hello world';        // test attributeChanged
         this.setAttribute('attr', 'attr');
         console.log('attributeToProperty: pull is', this.pull);
diff --git a/test/smoke/bindings.html b/test/smoke/bindings.html
index 5c20fd4a84..9982659a24 100644
--- a/test/smoke/bindings.html
+++ b/test/smoke/bindings.html
@@ -64,7 +64,8 @@
 
     class XBindings extends HTMLElement {
 
-      createdCallback() {
+      constructor() {
+        super();
         var dom = document.importNode(template.content, true);
         propertyEffects.setupBindings(this, dom, notes);
         this.attachShadow({mode:'open'}).appendChild(dom);
@@ -87,7 +88,8 @@
 
     class XClient extends HTMLElement {
 
-      createdCallback() {
+      constructor() {
+        super();
         var dom = document.importNode(clientTemplate.content, true);
         propertyEffects.setupBindings(this, dom, clientNotes);
         this.attachShadow({mode: 'open'}).appendChild(dom);
diff --git a/test/smoke/cev1.html b/test/smoke/cev1.html
deleted file mode 100644
index 6442526435..0000000000
--- a/test/smoke/cev1.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
-<html>
-<head>
-  <title>Polymer - events</title>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
-
-  <script>
-  (function() {
-
-    'use strict';
-
-    var classCache = new Map();
-
-    function chainPolymerBase(sup) {
-      return class extends sup {
-        constructor() {
-          super();
-          console.log('Polymer base sublcass');
-          if (this.createdCallback) {
-            this.createdCallback();
-          }
-        }
-      }
-    }
-
-    function PolymerElement(elClass) {
-      var klass = classCache.get(elClass);
-      if (!klass) {
-        klass = chainPolymerBase(elClass);
-        classCache.set(elClass, klass);
-      }
-      return klass;
-    }
-
-    function Polymer(info, extra) {
-      var klass;
-      if (typeof info !== 'function') {
-        klass = class extends PolymerElement(HTMLElement) {};
-        Object.assign(klass.prototype, info);
-      } else {
-        klass = info;
-      }
-      if (extra) {
-        Object.assign(klass.prototype, extra);
-      }
-      customElements.define(klass.prototype.is, klass);
-    }
-
-    Polymer({
-      is: 'x-foo',
-      createdCallback: function() {
-        console.log('x-foo');
-      }
-    });
-
-    Polymer({
-      is: 'x-bar',
-      createdCallback: function() {
-        console.log('x-bar');
-      }
-    });
-
-    Polymer(class extends PolymerElement(HTMLElement) {
-      constructor() {
-        super();
-        console.log('x-zot');
-      }
-    }, {
-      is: 'x-zot'
-    });
-
-
-  })();
-  </script>
-</head>
-<body>
-  <x-foo></x-foo>
-  <x-bar></x-bar>
-  <x-zot></x-zot>
-</body>
-</html>
diff --git a/test/smoke/css-properties.html b/test/smoke/css-properties.html
index ac6bfd0baf..d743b5f323 100644
--- a/test/smoke/css-properties.html
+++ b/test/smoke/css-properties.html
@@ -35,7 +35,8 @@
 let before = document.querySelector('#before');
 let nativeShadow = true;
 class XFoo extends HTMLElement {
-  createdCallback() {
+  constructor() {
+    super();
     this._setupStyleProperties();
     let template = document.querySelector('template#x');
     let content = template.content.cloneNode(true);
diff --git a/test/smoke/data-lazy.html b/test/smoke/data-lazy.html
index dca3662788..baeea5390a 100644
--- a/test/smoke/data-lazy.html
+++ b/test/smoke/data-lazy.html
@@ -100,10 +100,7 @@
     class XProperties extends HTMLElement {
 
       constructor() {
-        this.createdCallback();
-      }
-
-      createdCallback() {
+        super();
         data.prepare(this, function() {
           this.attachShadow({mode:'open'}).appendChild(data.stamp(this, template))
         });
@@ -126,10 +123,6 @@
       }
 
       connectedCallback() {
-        this.attachedCallback();
-      }
-
-      attachedCallback() {
         data.flush(this);
       }
 
@@ -187,10 +180,7 @@
     class XClient extends HTMLElement {
 
       constructor() {
-        this.createdCallback();
-      }
-
-      createdCallback() {
+        super();
         data.prepare(this, function() {
           this.attachShadow({mode:'open'}).appendChild(data.stamp(this, clientTemplate))
         });
@@ -199,17 +189,14 @@
         }
         this.foo = 'foo';
         this.ziz = 'ziz';
-        this.bar = 'bar';      }
+        this.bar = 'bar';
+      }
 
       attributeChangedCallback(name, old, value) {
         attributes.attributeToProperty(this, name, value);
       }
 
       connectedCallback() {
-        this.attachedCallback();
-      }
-
-      attachedCallback() {
         data.flush(this);
       }
 
@@ -250,9 +237,8 @@
 
     class XPropertiesSub extends XProperties {
 
-      createdCallback() {
-
-        super.createdCallback();
+      constructor() {
+        super();
 
         // data.addPropertyEffect(this, 'foo', {
         //   fn: function() {
diff --git a/test/smoke/data-observers.html b/test/smoke/data-observers.html
index 8da5dd6940..18fd5c0a86 100644
--- a/test/smoke/data-observers.html
+++ b/test/smoke/data-observers.html
@@ -59,7 +59,8 @@
     var data = new Polymer.BatchedEffects(stamper, attributes);
 
     class XHost extends HTMLElement {
-      createdCallback() {
+      constructor() {
+        super();
         this.prop = 'prop';
         var dom = data.ensureStamped(this, hostTemplate);
         this.attachShadow({mode:'open'}).appendChild(dom);
@@ -85,7 +86,8 @@
 
     var clientTemplate = document.querySelector('template#x-client');
     class XClient extends HTMLElement {
-      createdCallback() {
+      constructor() {
+        super();
         var dom = data.ensureStamped(this, clientTemplate);
         this.attachShadow({mode:'open'}).appendChild(dom);
       }
diff --git a/test/smoke/data-path.html b/test/smoke/data-path.html
index 862c782b6a..9d9a66032c 100644
--- a/test/smoke/data-path.html
+++ b/test/smoke/data-path.html
@@ -78,17 +78,12 @@
     var objTemplate = document.querySelector('template#x-obj');
     class XObj extends HTMLElement {
       constructor() {
-        this.createdCallback();
-      }
-      createdCallback() {
+        super();
         data.prepare(this, function() {
           this.attachShadow({mode:'open'}).appendChild(data.stamp(this, objTemplate));
         });
       }
       connectedCallback() {
-        this.attachedCallback();
-      }
-      attachedCallback() {
         data.flush(this);
       }
     }
@@ -98,17 +93,12 @@
     var propTemplate = document.querySelector('template#x-prop');
     class XProp extends HTMLElement {
       constructor() {
-        this.createdCallback();
-      }
-      createdCallback() {
+        super();
         data.prepare(this, function() {
           this.attachShadow({mode:'open'}).appendChild(data.stamp(this, propTemplate));
         });
       }
       connectedCallback() {
-        this.attachedCallback();
-      }
-      attachedCallback() {
         data.flush(this);
       }
     }
@@ -119,9 +109,7 @@
     var hostTemplate = document.querySelector('template#x-host');
     class XHost extends HTMLElement {
       constructor() {
-        this.createdCallback();
-      }
-      createdCallback() {
+        super();
         data.prepare(this, function() {
           this.attachShadow({mode:'open'}).appendChild(data.stamp(this, hostTemplate));
         });
@@ -135,9 +123,6 @@
         };
       }
       connectedCallback() {
-        this.attachedCallback();
-      }
-      attachedCallback() {
         data.flush(this);
       }
     }
diff --git a/test/smoke/data.html b/test/smoke/data.html
index b386598983..c32129a368 100644
--- a/test/smoke/data.html
+++ b/test/smoke/data.html
@@ -80,10 +80,6 @@
 
       constructor() {
         super();
-        this.createdCallback();
-      }
-
-      createdCallback() {
         data.prepare(this, function() {
           this.attachShadow({mode: 'open'}).appendChild(data.stamp(this, template));
         });
@@ -93,10 +89,6 @@
       }
 
       connectedCallback() {
-        this.attachedCallback();
-      }
-
-      attachedCallback() {
         data.flush(this);
       }
 
@@ -169,10 +161,6 @@
 
       constructor() {
         super();
-        this.createdCallback();
-      }
-
-      createdCallback() {
         data.prepare(this, function() {
           this.attachShadow({mode: 'open'}).appendChild(data.stamp(this, clientTemplate));
         });
@@ -183,10 +171,6 @@
       }
 
       connectedCallback() {
-        this.attachedCallback();
-      }
-
-      attachedCallback() {
         data.flush(this);
       }
 
@@ -249,8 +233,8 @@
 
     class XHostSub extends XHost {
 
-      createdCallback() {
-        super.createdCallback();
+      constructor() {
+        super();
         data.addPropertyEffect(this, 'foo', {
           fn: function() {
             console.log(logEl(this), 'custom3', arguments);
@@ -261,8 +245,7 @@
         console.log(logEl(this), 'fooChanged2', value);
       }
     }
-    data.createObserver(XHostSub, 'foo',
-      'fooChanged2');
+    data.createObserver(XHostSub, 'foo', 'fooChanged2');
     customElements.define('x-host-sub', XHostSub);
 
   })();
diff --git a/test/smoke/dom-if.html b/test/smoke/dom-if.html
index ce02573d98..93f92df9ba 100644
--- a/test/smoke/dom-if.html
+++ b/test/smoke/dom-if.html
@@ -32,18 +32,13 @@
 
     class XHost extends HTMLElement {
       constructor() {
-        this.createdCallback();
-      }
-      createdCallback() {
+        super();
         data.prepare(this, function() {
           this.attachShadow({mode:'open'}).appendChild(data.stamp(this, template));
         });
         this.hostProp = 'prop';
       }
       connectedCallback() {
-        this.attachedCallback();
-      }
-      attachedCallback() {
         data.flush(this);
       }
     }
diff --git a/test/smoke/dom-repeat.html b/test/smoke/dom-repeat.html
index 677831e242..c4094fa27a 100644
--- a/test/smoke/dom-repeat.html
+++ b/test/smoke/dom-repeat.html
@@ -37,9 +37,7 @@
 
       class XHost extends HTMLElement {
         constructor() {
-          this.createdCallback();
-        }
-        createdCallback() {
+          super();
           var self = this;
           data.prepare(this, function() {
             this.attachShadow({mode:'open'}).appendChild(data.stamp(this, template));
@@ -51,9 +49,6 @@
           ];
         }
         connectedCallback() {
-          this.attachedCallback();
-        }
-        attachedCallback() {
           data.flush(this);
         }
       }
diff --git a/test/smoke/events-polymer.html b/test/smoke/events-polymer.html
index 2e5c262799..9cfa7592ef 100644
--- a/test/smoke/events-polymer.html
+++ b/test/smoke/events-polymer.html
@@ -24,7 +24,8 @@
 
     class XBase extends HTMLElement {
 
-      createdCallback() {
+      constructor() {
+        super();
         this.textContent = this.localName;
         Events.addMethodListener(this, 'tap', '_tap');
       }
diff --git a/test/smoke/events.html b/test/smoke/events.html
index f68f7e55b8..3dd5ef1e62 100644
--- a/test/smoke/events.html
+++ b/test/smoke/events.html
@@ -26,7 +26,8 @@
 
     class XBase extends HTMLElement {
 
-      createdCallback() {
+      constructor() {
+        super();
         this.textContent = 'hello world';
         Events.addMethodListener(this, 'down', '_logEvent');
         Events.addMethodListener(this, 'up', '_logEvent');
diff --git a/test/smoke/polymer.html b/test/smoke/polymer.html
index 16b2479063..6bf3a6609b 100644
--- a/test/smoke/polymer.html
+++ b/test/smoke/polymer.html
@@ -25,10 +25,6 @@
 
       constructor() {
         super();
-        this.createdCallback();
-      }
-
-      createdCallback() {
         this.textContent = this.localName;
       }
 
@@ -44,11 +40,6 @@
 
       constructor() {
         super();
-        this.createdCallback();
-      }
-
-      createdCallback() {
-        super.createdCallback();
         this.textContent += ' (overridden!)';
       }
 
diff --git a/test/smoke/properties-invalidate-be.html b/test/smoke/properties-invalidate-be.html
index bca2de1b4d..7b87d64816 100644
--- a/test/smoke/properties-invalidate-be.html
+++ b/test/smoke/properties-invalidate-be.html
@@ -52,13 +52,14 @@
         attributes.attributeToProperty(this, name, value);
       }
 
-      createdCallback() {
+      constructor() {
+        super();
         this.dom = new XTestDom();
         this.attachShadow({mode:'open'}).appendChild(data.stamp(template, this.dom));
         data.enablePropertyEffects(this.dom);
       }
 
-      validate(props) {
+      propertiesChanged(props) {
         this.dom.setProperties({
           foo: props.foo,
           bar: props.bar,
diff --git a/test/smoke/properties-invalidate-raw.html b/test/smoke/properties-invalidate-raw.html
index 73f787b400..5a4b5c366b 100644
--- a/test/smoke/properties-invalidate-raw.html
+++ b/test/smoke/properties-invalidate-raw.html
@@ -48,12 +48,13 @@
         attributes.attributeToProperty(this, name, value);
       }
 
-      createdCallback() {
+      constructor() {
+        super();
         this.attachShadow({mode:'open'}).appendChild(
           document.importNode(template.content, true));
       }
 
-      validate(props, oldProps, changedProps) {
+      propertiesChanged(props, oldProps, changedProps) {
         if (changedProps.foo) {
           this.shadowRoot.querySelector('#foo').textContent = props.foo;
         }
diff --git a/test/smoke/properties-invalidate-stampino.html b/test/smoke/properties-invalidate-stampino.html
index d1d8e31f05..6c5eca3bb0 100644
--- a/test/smoke/properties-invalidate-stampino.html
+++ b/test/smoke/properties-invalidate-stampino.html
@@ -53,13 +53,14 @@
         attributes.attributeToProperty(this, name, value);
       }
 
-      createdCallback() {
+      constructor() {
+        super();
         this.dom = new XTestDom();
         this.attachShadow({mode:'open'}).appendChild(data.stamp(template, this.dom));
         data.enablePropertyEffects(this.dom);
       }
 
-      validate(props, oldProps, changedProps) {
+      propertiesChanged(props, oldProps, changedProps) {
         this.dom.setProperties({
           foo: props.foo,
           bar: props.bar,
diff --git a/test/smoke/properties-invalidate.html b/test/smoke/properties-invalidate.html
index 339696b43d..b85e426d58 100644
--- a/test/smoke/properties-invalidate.html
+++ b/test/smoke/properties-invalidate.html
@@ -41,9 +41,7 @@
         attributes.attributeToProperty(this, name, value);
       }
 
-      createdCallback() {      }
-
-      validate(props, oldProps, changedProps) {
+      propertiesChanged(props, oldProps, changedProps) {
         console.info(props, oldProps, changedProps);
       }
 
diff --git a/test/smoke/properties.html b/test/smoke/properties.html
index 7bc0d1b777..4ab0efa4a2 100644
--- a/test/smoke/properties.html
+++ b/test/smoke/properties.html
@@ -32,7 +32,8 @@
 
     class XProperties extends HTMLElement {
 
-      createdCallback() {
+      constructor() {
+        super();
         if (this.hasAttribute('runtime')) {
           PropertyEffects.addPropertyEffect(this, 'foo', {
             fn: function() {
@@ -111,10 +112,8 @@
 
     class XPropertiesSub extends XProperties {
 
-      createdCallback() {
-
-        super.createdCallback();
-
+      constructor() {
+        super();
         PropertyEffects.addPropertyEffect(this, 'foo', {
           fn: function() {
             console.log('custom3', logEl(this), arguments);
diff --git a/test/smoke/shadow-with-css.html b/test/smoke/shadow-with-css.html
index 821367bba0..bb5fae5670 100644
--- a/test/smoke/shadow-with-css.html
+++ b/test/smoke/shadow-with-css.html
@@ -60,7 +60,7 @@
 
     class XBaseV1 extends HTMLElement {
 
-      attachedCallback() {
+      connectedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
           Polymer.StyleLib.prepareHost(this, template);
@@ -99,7 +99,7 @@
 
     class XBaseV0 extends HTMLElement {
 
-      attachedCallback() {
+      connectedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
           this.attachShadow({mode:'open'}).appendChild(
@@ -143,7 +143,7 @@
     var template = document.querySelector('template#x-child');
 
     class XChild extends HTMLElement {
-      attachedCallback() {
+      connectedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
           Polymer.StyleLib.prepareHost(this, template);
@@ -177,7 +177,7 @@
     var template = document.querySelector('template#x-parent');
 
     class XParent extends HTMLElement {
-      attachedCallback() {
+      connectedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
           Polymer.StyleLib.prepareHost(this, template);
diff --git a/test/smoke/shady-slot-observer.html b/test/smoke/shady-slot-observer.html
index 8f1a7423bf..8820407678 100644
--- a/test/smoke/shady-slot-observer.html
+++ b/test/smoke/shady-slot-observer.html
@@ -44,7 +44,7 @@
 
     class XBaseV1 extends HTMLElement {
 
-      attachedCallback() {
+      connectedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
           this.attachShadow({mode: 'open'}).appendChild(
diff --git a/test/smoke/shady-slot.html b/test/smoke/shady-slot.html
index 3bdeb4197b..35a497cdeb 100644
--- a/test/smoke/shady-slot.html
+++ b/test/smoke/shady-slot.html
@@ -44,7 +44,7 @@
 
     class XBaseV1 extends HTMLElement {
 
-      attachedCallback() {
+      connectedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
           this.attachShadow({mode: 'open'}).appendChild(
diff --git a/test/smoke/shady-with-css-dynamic.html b/test/smoke/shady-with-css-dynamic.html
index 942eb629a2..0a1924dec2 100644
--- a/test/smoke/shady-with-css-dynamic.html
+++ b/test/smoke/shady-with-css-dynamic.html
@@ -61,7 +61,7 @@
 
     class XBaseV1 extends HTMLElement {
 
-      attachedCallback() {
+      connectedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
           Polymer.StyleLib.prepareHost(this, template);
@@ -116,7 +116,7 @@
 
     class XBaseV0 extends HTMLElement {
 
-      attachedCallback() {
+      connectedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
           this.attachShadow({mode:'open'}).appendChild(
@@ -160,7 +160,7 @@
     var template = document.querySelector('template#x-child');
 
     class XChild extends HTMLElement {
-      attachedCallback() {
+      connectedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
           Polymer.StyleLib.prepareHost(this, template);
@@ -194,7 +194,7 @@
     var template = document.querySelector('template#x-parent');
 
     class XParent extends HTMLElement {
-      attachedCallback() {
+      connectedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
           Polymer.StyleLib.prepareHost(this, template);
diff --git a/test/smoke/shady-with-css.html b/test/smoke/shady-with-css.html
index 6521a04b74..2f4e410847 100644
--- a/test/smoke/shady-with-css.html
+++ b/test/smoke/shady-with-css.html
@@ -61,7 +61,7 @@
 
     class XBaseV1 extends HTMLElement {
 
-      attachedCallback() {
+      connectedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
           Polymer.StyleLib.prepareHost(this, template);
@@ -101,7 +101,7 @@
 
     class XBaseV0 extends HTMLElement {
 
-      attachedCallback() {
+      connectedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
           this.attachShadow({mode:'open'}).appendChild(
@@ -145,7 +145,7 @@
     var template = document.querySelector('template#x-child');
 
     class XChild extends HTMLElement {
-      attachedCallback() {
+      connectedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
           Polymer.StyleLib.prepareHost(this, template);
@@ -179,7 +179,7 @@
     var template = document.querySelector('template#x-parent');
 
     class XParent extends HTMLElement {
-      attachedCallback() {
+      connectedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
           Polymer.StyleLib.prepareHost(this, template);
diff --git a/test/smoke/shady.html b/test/smoke/shady.html
index ee5a8b111a..687912be91 100644
--- a/test/smoke/shady.html
+++ b/test/smoke/shady.html
@@ -39,7 +39,7 @@
 
     class XBaseV1 extends HTMLElement {
 
-      attachedCallback() {
+      connectedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
           this.attachShadow({mode: 'open'}).appendChild(
@@ -79,7 +79,7 @@
 
     class XBaseV0 extends HTMLElement {
 
-      attachedCallback() {
+      connectedCallback() {
         if (!this.__stamped) {
           this.__stamped = true;
           this.attachShadow({mode:'open'}).appendChild(
diff --git a/test/smoke/template-polymer.html b/test/smoke/template-polymer.html
index 9b9e7bcc49..e739542159 100644
--- a/test/smoke/template-polymer.html
+++ b/test/smoke/template-polymer.html
@@ -41,7 +41,7 @@
 
     class XTemplate extends HTMLElement {
 
-      attachedCallback() {
+      connectedCallback() {
         if (!this.__hasAttached) {
           this.__hasAttached = true;
           var dom = stamper.stamp(template, this);
diff --git a/test/smoke/template.html b/test/smoke/template.html
index 8e4032a6db..be60d91fba 100644
--- a/test/smoke/template.html
+++ b/test/smoke/template.html
@@ -44,7 +44,7 @@
 
     class XTemplate extends HTMLElement {
 
-      attachedCallback() {
+      connectedCallback() {
         if (!this.__hasAttached) {
           this.__hasAttached = true;
           var dom = stamper.stamp(template, this);
diff --git a/test/smoke/templatizer.html b/test/smoke/templatizer.html
index 6a0cad0b6b..54a93eb78c 100644
--- a/test/smoke/templatizer.html
+++ b/test/smoke/templatizer.html
@@ -33,18 +33,11 @@
     class XTemplatizer extends HTMLElement {
 
       constructor() {
-        this.createdCallback();
-      }
-
-      createdCallback() {
+        super();
         this.prop = 0;
       }
 
       connectedCallback() {
-        this.attachedCallback();
-      }
-
-      attachedCallback() {
         data.flush(this);
         var template = this.querySelector('template');
         var self = this;
@@ -96,10 +89,6 @@
     class XHost extends HTMLElement {
 
       constructor() {
-        this.createdCallback();
-      }
-
-      createdCallback() {
         data.prepare(this, function() {
           this.attachShadow({mode:'open'}).appendChild(data.stamp(this, template));
         });
@@ -107,10 +96,6 @@
       }
 
       connectedCallback() {
-        this.attachedCallback();
-      }
-
-      attachedCallback() {
         data.flush(this);
       }
 
diff --git a/test/smoke/utils.html b/test/smoke/utils.html
index b9c63315e1..c11ffb2d4e 100644
--- a/test/smoke/utils.html
+++ b/test/smoke/utils.html
@@ -47,7 +47,8 @@
 
     class XUtils extends HTMLElement {
 
-      createdCallback() {
+      constructor() {
+        super();
         var dom = templateStamp.stamp(template, this);
         propertyEffects.setupBindings(this, dom, notes);
         this.attachShadow({mode:'open'}).appendChild(dom);
diff --git a/test/smoke/zero.html b/test/smoke/zero.html
index 0c977aa17c..cdb4006939 100644
--- a/test/smoke/zero.html
+++ b/test/smoke/zero.html
@@ -19,7 +19,8 @@
   'use strict';
 
   class XBase extends HTMLElement {
-    createdCallback() {
+    constructor() {
+      super();
       this.textContent = 'hello world';
     }
   };
diff --git a/test/unit/notify-path.html b/test/unit/notify-path.html
index c1c9ba59b9..9c06f1f337 100644
--- a/test/unit/notify-path.html
+++ b/test/unit/notify-path.html
@@ -1038,16 +1038,7 @@
     try {
       new (Polymer({
         is: 'x-broken',
-        observers: ['foo(missingParenthesis'],
-        // TODO(kschaaf): in CEv0, errors thrown during creation do not throw
-        // back to the caller (nanotask issue?); need to catch here...
-        createdCallback: function() {
-          try {
-            Polymer.Base.createdCallback.call(this);
-          } catch(e) {
-            verifyError(e);
-          }
-        }
+        observers: ['foo(missingParenthesis']
       }))();
     } catch (e) {
       verifyError(e);
diff --git a/test/unit/styling-cross-scope-unknown-host.html b/test/unit/styling-cross-scope-unknown-host.html
index e5b06e871c..a8cbdf57f2 100644
--- a/test/unit/styling-cross-scope-unknown-host.html
+++ b/test/unit/styling-cross-scope-unknown-host.html
@@ -35,9 +35,6 @@
       class UnknownHost extends HTMLElement {
         constructor() {
           super();
-          this.createdCallback();
-        }
-        createdCallback() {
           this.attachShadow({mode: 'open'});
         }
       }

From 7d7b74a3ddf8a08946bf081f20817bfa63480bfa Mon Sep 17 00:00:00 2001
From: Kevin Schaaf <kschaaf@google.com>
Date: Tue, 23 Aug 2016 17:00:51 -0700
Subject: [PATCH 6/8] getEffectiveChildNodes: remove <content> support

---
 src/elements/compat-element.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/elements/compat-element.html b/src/elements/compat-element.html
index 2c6562e769..084bd12de5 100644
--- a/src/elements/compat-element.html
+++ b/src/elements/compat-element.html
@@ -269,9 +269,7 @@
         var list = [];
         var c$ = this.childNodes;
         for (var i=0, l=c$.length, c; (i<l) && (c=c$[i]); i++) {
-          // BREAKME(sorvell): remove when V0 ShadowDom support is removed.
-          var d$ = (c.localName === 'content') ? c.getDistributedNodes() :
-            ((c.localName === 'slot') ? c.assignedNodes({flatten: true}) : null);
+          var d$ = (c.localName === 'slot') ? c.assignedNodes({flatten: true}) : null;
           if (d$) {
             for (var j=0; j < d$.length; j++) {
               list.push(d$[j]);

From 92538a6091ebb42aeba53d51d60da5ed8bf81993 Mon Sep 17 00:00:00 2001
From: Kevin Schaaf <kschaaf@google.com>
Date: Wed, 24 Aug 2016 15:18:23 -0700
Subject: [PATCH 7/8] Add import smoke test.

---
 test/smoke/import-test.html | 46 +++++++++++++++++++++++++++++++++++++
 test/smoke/import.html      | 27 ++++++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 test/smoke/import-test.html
 create mode 100644 test/smoke/import.html

diff --git a/test/smoke/import-test.html b/test/smoke/import-test.html
new file mode 100644
index 0000000000..ae830136a0
--- /dev/null
+++ b/test/smoke/import-test.html
@@ -0,0 +1,46 @@
+<!doctype html>
+<!--
+@license
+Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<html>
+<head>
+  <title>import test</title>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <script>
+    window.XTest = class XTest extends HTMLElement {
+      static get observedAttributes() { return ['attr']; }
+      constructor() {
+        super();
+      //   this.createdCallback();
+      // }
+      // createdCallback() {
+        console.debug(this.localName, 'constructed');
+        if (this.localName !== 'x-test') {
+          alert('imports upgrade!');
+        }
+      }
+      connectedCallback() {
+        console.debug(this.localName, 'connected');
+      }
+      attributeChangedCallback() {
+        console.debug(this.localName, 'attributeChanged');
+      }
+    }
+    // customElements.define = document.registerElement.bind(document);
+    customElements.define('x-test', class extends XTest {});
+    customElements.define('x-test-main', class extends XTest {});
+  </script>
+  <link rel="import" href="import.html">
+<body>
+
+<x-test attr="attr"></x-test>
+
+</body>
+</html>
diff --git a/test/smoke/import.html b/test/smoke/import.html
new file mode 100644
index 0000000000..292e5aab61
--- /dev/null
+++ b/test/smoke/import.html
@@ -0,0 +1,27 @@
+<!doctype html>
+<!--
+@license
+Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<html>
+<head>
+  <title>Polymer - events</title>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+<body>
+
+<script>
+  console.info('import loaded')
+  customElements.define('x-test-import', class extends XTest {});
+</script>
+
+<x-test-main attr="attr"></x-test-main>
+<x-test-import attr="attr"></x-test-import>
+
+</body>
+</html>

From 242bd7acb5d9ac60d9f0b7086043f76ca66d90e9 Mon Sep 17 00:00:00 2001
From: Kevin Schaaf <kschaaf@google.com>
Date: Wed, 24 Aug 2016 15:23:11 -0700
Subject: [PATCH 8/8] Test in shady and native.

---
 test/runner.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/runner.html b/test/runner.html
index b0e2fc644a..3ebdc12cae 100644
--- a/test/runner.html
+++ b/test/runner.html
@@ -63,8 +63,7 @@
       }, []);
     }
 
-    // suites = combinations(suites, [['', 'shadowDomV0=true'], ['wc-ce=v0', 'wc-ce=v0&wc-register', 'wc-ce=v1']]);
-    suites = combinations(suites, [['wc-ce=v1&wc-register=true']]);
+    suites = combinations(suites, [['wc-ce=v1&wc-register=true'], ['forceShadyDom=true', '']]);
     console.log('Testing suites:\n\t' + suites.join('\n\t'));
 
     WCT.loadSuites(suites);