Split MessageKind into a MessageKind key and a MessageTemplate.

tests/compiler/dart2js/import_mirrors_test.dart

 // 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.
 
 // Test that the compiler emits a warning on import of 'dart:mirrors' unless
 // the flag --enable-experimental-mirrors is used.
 
 library dart2js.test.import;
 
 import 'dart:async';
 import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
-import 'package:compiler/src/dart2jslib.dart' show MessageKind;
+import 'package:compiler/src/warnings.dart' show MessageKind, MessageTemplate;
 import 'memory_compiler.dart';
 
 const DIRECT_IMPORT = const {
   '/main.dart': '''
 import 'dart:mirrors';
 
 main() {}
 ''',
 
   'paths':
@@ skipping 340 matching lines @@
   if (enableExperimentalMirrors) {
     Expect.equals(0, collector.warnings.length,
                   'Warnings: ${collector.errors}');
   } else {
     Expect.equals(1, collector.warnings.length,
                   'Warnings: ${collector.errors}');
     Expect.equals(
         MessageKind.IMPORT_EXPERIMENTAL_MIRRORS,
         collector.warnings.first.message.kind);
     Expect.equals(
-        expectedPaths.join(MessageKind.IMPORT_EXPERIMENTAL_MIRRORS_PADDING),
+        expectedPaths.join(MessageTemplate.IMPORT_EXPERIMENTAL_MIRRORS_PADDING),
         collector.warnings.first.message.arguments['importChain']);
   }
 }
 
 Future checkPaths(Map sourceData) {
   Map sourceFiles = sourceData;
   var expectedPaths = sourceData['paths'];
   var expectedVerbosePaths = sourceData['verbosePaths'];
   if (expectedVerbosePaths == null) {
     expectedVerbosePaths = expectedPaths;
@@ skipping 21 matching lines @@
       DUAL_INDIRECT_IMPORT3,
       DUAL_INDIRECT_PACKAGE_IMPORT1,
       DIRECT_EXPORT,
       INDIRECT_EXPORT1,
       INDIRECT_EXPORT2,
       INDIRECT_PACKAGE_EXPORT1,
       INDIRECT_PACKAGE_EXPORT2],
       (map) => checkPaths(map)
   ));
 }