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

pkg/code_transformers/test/resolver_test.dart

Index: pkg/code_transformers/test/resolver_test.dart
===================================================================
--- pkg/code_transformers/test/resolver_test.dart	(revision 37373)
+++ pkg/code_transformers/test/resolver_test.dart	(working copy)
@@ -14,9 +14,21 @@
 
 main() {
   useCompactVMConfiguration();
+  group('mock sdk', () {
+    resolverTests(new Resolvers.fromMock({
+      'dart:core': 'library dart.core;\nclass Object {}',
+      'dart:async': 'library dart.async;',
+      'dart:html': 'library dart.html;',
+    }));
+  });
+
+  group('real sdk', () {
+    resolverTests(new Resolvers(testingDartSdkDirectory));
+  });
+}
+
+resolverTests(Resolvers resolvers) {
   var entryPoint = new AssetId('a', 'web/main.dart');
-  var resolvers = new Resolvers(testingDartSdkDirectory);
-
   Future validateResolver({Map<String, String> inputs, validator(Resolver),
       List<String> messages: const[]}) {
     return applyTransformers(