merge to trunk all changes from 36817 until 37378 under the packages: polymer,

pkg/polymer/test/entered_view_test.dart

Index: pkg/polymer/test/entered_view_test.dart
===================================================================
--- pkg/polymer/test/entered_view_test.dart	(revision 37373)
+++ pkg/polymer/test/entered_view_test.dart	(working copy)
@@ -23,9 +23,9 @@
 
   XInner.created() : super.created();
 
-  enteredView() {
+  attached() {
     enteredCount++;
-    super.enteredView();
+    super.attached();
   }
 }
 
@@ -44,7 +44,7 @@
       // it goes before we do.
       return new Future(() {
         XInner inner = outer.shadowRoot.querySelector('x-inner');
-        expect(inner.enteredCount, 1, reason: 'enteredView should be called');
+        expect(inner.enteredCount, 1, reason: 'attached should be called');
       });
     });
   });