| Index: pkg/analyzer/test/src/context/mock_sdk.dart | 
| diff --git a/pkg/analyzer/test/src/context/mock_sdk.dart b/pkg/analyzer/test/src/context/mock_sdk.dart | 
| index e5b7bcb772de78d396bf6dd3bfd698e3a70c8bb6..25de8b3bd4db88e81c83e0c0843024a56f00eca4 100644 | 
| --- a/pkg/analyzer/test/src/context/mock_sdk.dart | 
| +++ b/pkg/analyzer/test/src/context/mock_sdk.dart | 
| @@ -14,8 +14,10 @@ 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'; | 
| @@ -108,8 +110,10 @@ class _Override { | 
| const Object override = const _Override(); | 
| '''); | 
|  | 
| -  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'; | 
| @@ -125,14 +129,18 @@ abstract class StreamTransformer<S, T> {} | 
| '''); | 
|  | 
| static const _MockSdkLibrary LIB_COLLECTION = const _MockSdkLibrary( | 
| -      'dart:collection', '/lib/collection/collection.dart', ''' | 
| +      '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', ''' | 
| +      'dart:convert', | 
| +      '/lib/convert/convert.dart', | 
| +      ''' | 
| library dart.convert; | 
|  | 
| import 'dart:async'; | 
| @@ -141,8 +149,10 @@ 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; | 
| @@ -159,8 +169,10 @@ 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 {} | 
| '''); | 
|  |