| Index: pkg/analysis_server/test/mock_sdk.dart
 | 
| diff --git a/pkg/analysis_server/test/mock_sdk.dart b/pkg/analysis_server/test/mock_sdk.dart
 | 
| index 4589c2270ed5550b6d47cfdbb794ec084c693b88..19679949589216055fef65a1841630243843d109 100644
 | 
| --- a/pkg/analysis_server/test/mock_sdk.dart
 | 
| +++ b/pkg/analysis_server/test/mock_sdk.dart
 | 
| @@ -10,10 +10,9 @@ import 'package:analyzer/src/generated/engine.dart';
 | 
|  import 'package:analyzer/src/generated/sdk.dart';
 | 
|  import 'package:analyzer/src/generated/source.dart';
 | 
|  
 | 
| -
 | 
|  class MockSdk implements DartSdk {
 | 
| -  static const _MockSdkLibrary LIB_CORE =
 | 
| -      const _MockSdkLibrary('dart:core', '/lib/core/core.dart', '''
 | 
| +  static const _MockSdkLibrary LIB_CORE = const _MockSdkLibrary('dart:core',
 | 
| +      '/lib/core/core.dart', '''
 | 
|  library dart.core;
 | 
|  
 | 
|  import 'dart:async';
 | 
| @@ -101,8 +100,8 @@ external bool identical(Object a, Object b);
 | 
|  void print(Object object) {}
 | 
|  ''');
 | 
|  
 | 
| -  static const _MockSdkLibrary LIB_ASYNC =
 | 
| -      const _MockSdkLibrary('dart:async', '/lib/async/async.dart', '''
 | 
| +  static const _MockSdkLibrary LIB_ASYNC = const _MockSdkLibrary('dart:async',
 | 
| +      '/lib/async/async.dart', '''
 | 
|  library dart.async;
 | 
|  
 | 
|  import 'dart:math';
 | 
| @@ -117,15 +116,15 @@ class Stream<T> {}
 | 
|  abstract class StreamTransformer<S, T> {}
 | 
|  ''');
 | 
|  
 | 
| -  static const _MockSdkLibrary LIB_COLLECTION =
 | 
| -      const _MockSdkLibrary('dart:collection', '/lib/collection/collection.dart', '''
 | 
| +  static const _MockSdkLibrary LIB_COLLECTION = const _MockSdkLibrary(
 | 
| +      'dart:collection', '/lib/collection/collection.dart', '''
 | 
|  library dart.collection;
 | 
|  
 | 
|  abstract class HashMap<K, V> implements Map<K, V> {}
 | 
|  ''');
 | 
|  
 | 
| -  static const _MockSdkLibrary LIB_CONVERT =
 | 
| -      const _MockSdkLibrary('dart:convert', '/lib/convert/convert.dart', '''
 | 
| +  static const _MockSdkLibrary LIB_CONVERT = const _MockSdkLibrary(
 | 
| +      'dart:convert', '/lib/convert/convert.dart', '''
 | 
|  library dart.convert;
 | 
|  
 | 
|  import 'dart:async';
 | 
| @@ -134,8 +133,8 @@ abstract class Converter<S, T> implements StreamTransformer {}
 | 
|  class JsonDecoder extends Converter<String, Object> {}
 | 
|  ''');
 | 
|  
 | 
| -  static const _MockSdkLibrary LIB_MATH =
 | 
| -      const _MockSdkLibrary('dart:math', '/lib/math/math.dart', '''
 | 
| +  static const _MockSdkLibrary LIB_MATH = const _MockSdkLibrary('dart:math',
 | 
| +      '/lib/math/math.dart', '''
 | 
|  library dart.math;
 | 
|  const double E = 2.718281828459045;
 | 
|  const double PI = 3.1415926535897932;
 | 
| @@ -152,19 +151,20 @@ class Random {
 | 
|  }
 | 
|  ''');
 | 
|  
 | 
| -  static const _MockSdkLibrary LIB_HTML =
 | 
| -      const _MockSdkLibrary('dart:html', '/lib/html/dartium/html_dartium.dart', '''
 | 
| +  static const _MockSdkLibrary LIB_HTML = const _MockSdkLibrary('dart:html',
 | 
| +      '/lib/html/dartium/html_dartium.dart', '''
 | 
|  library dart.html;
 | 
|  class HtmlElement {}
 | 
|  ''');
 | 
|  
 | 
|    static const List<SdkLibrary> LIBRARIES = const [
 | 
| -      LIB_CORE,
 | 
| -      LIB_ASYNC,
 | 
| -      LIB_COLLECTION,
 | 
| -      LIB_CONVERT,
 | 
| -      LIB_MATH,
 | 
| -      LIB_HTML,];
 | 
| +    LIB_CORE,
 | 
| +    LIB_ASYNC,
 | 
| +    LIB_COLLECTION,
 | 
| +    LIB_CONVERT,
 | 
| +    LIB_MATH,
 | 
| +    LIB_HTML,
 | 
| +  ];
 | 
|  
 | 
|    final resource.MemoryResourceProvider provider =
 | 
|        new resource.MemoryResourceProvider();
 | 
| @@ -279,7 +279,6 @@ class HtmlElement {}
 | 
|    }
 | 
|  }
 | 
|  
 | 
| -
 | 
|  class _MockSdkLibrary implements SdkLibrary {
 | 
|    final String shortName;
 | 
|    final String path;
 | 
| 
 |