Bring back initPolymer, allow boot.js only if using "polymer_experimental.html".

pkg/polymer/e2e_test/canonicalization/test/dir/deploy_common.dart

Index: pkg/polymer/e2e_test/canonicalization/test/dir/deploy_common.dart
diff --git a/pkg/polymer/example/canonicalization2/test/bad_lib_import_negative_test.dart b/pkg/polymer/e2e_test/canonicalization/test/dir/deploy_common.dart
similarity index 53%
rename from pkg/polymer/example/canonicalization2/test/bad_lib_import_negative_test.dart
rename to pkg/polymer/e2e_test/canonicalization/test/dir/deploy_common.dart
index b9611b769aadbfb99afe81cb11111f40a5dc6dfd..a3f1b6a955bab41e36bfb97a23196e92fd7b6bfb 100644
--- a/pkg/polymer/example/canonicalization2/test/bad_lib_import_negative_test.dart
+++ b/pkg/polymer/e2e_test/canonicalization/test/dir/deploy_common.dart
@@ -1,39 +1,38 @@
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2014, 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.
 
-/// Tests how canonicalization works when using the deployed app.
-library canonicalization.bad_lib_import_negative;
+/// Tests how canonicalization works when using the deployed app. This is
+/// identical to the code in ../dir/deploy_common.dart but we need to copy it
+/// here because the 'packages/...' URLs below should be relative from the
+/// entrypoint directory.
+library canonicalization.test.dir.deploy_common;
 
 import 'package:unittest/unittest.dart';
 import 'package:unittest/html_config.dart';
 import 'package:polymer/polymer.dart';
 
-import 'package:canonicalization2/a.dart';
-import 'packages/canonicalization2/b.dart';
-import 'package:canonicalization2/c.dart';
-import 'package:canonicalization2/d.dart' as d1;
-import 'packages/canonicalization2/d.dart' as d2;
+import 'package:canonicalization/a.dart' show a;
+import 'packages/canonicalization/b.dart' show b;
+import 'package:canonicalization/c.dart' show c;
+import 'package:canonicalization/d.dart' as d1 show d;
+import 'packages/canonicalization/d.dart' as d2 show d;
 
-@initMethod
 main() {
+  initPolymer();
   useHtmlConfiguration();
 
   setUp(() => Polymer.onReady);
 
   test('canonicalization', () {
-    // "package:" urls work the same during development and deployment
     expect(a, 1, reason:
       'deploy picks the "package:" url as the canonical url for script tags.');
 
-    // relative urls do not. true, we shouldn't be using 'packages/' above, so
-    // that's ok.
+    // We shouldn't be using 'packages/' above, so that's ok.
     expect(b, 0, reason:
-      'deploy picks the "package:" url as the canonical url for script tags.');
+        'we pick the "package:" url as the canonical url for script tags.');
     expect(c, 2, reason: 'c was always imported with "package:" urls.');
     expect(d1.d, 2, reason: 'both a and b are loaded using package: urls');
-
-    // same here
     expect(d2.d, 0, reason: 'both a and b are loaded using package: urls');
   });
 }