Breaking changes in 'analyzer' package.

pkg/analysis_testing/lib/mock_sdk.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.
 
 library testing.mock_sdk;
 
 import 'package:analyzer/file_system/file_system.dart' as resource;
 import 'package:analyzer/file_system/memory_file_system.dart' as resource;
 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 {
-  final resource.MemoryResourceProvider provider =
-      new resource.MemoryResourceProvider();
-
   static const _MockSdkLibrary LIB_CORE =
       const _MockSdkLibrary('dart:core', '/lib/core/core.dart', '''
 library dart.core;
 class Object {}
 class Function {}
 class StackTrace {}
 class Symbol {}
 class Type {}
 
 abstract class Comparable<T> {
@@ skipping 59 matching lines @@
 library dart.html;
 class HtmlElement {}
 ''');
 
   static const List<SdkLibrary> LIBRARIES = const [
       LIB_CORE,
       LIB_ASYNC,
       LIB_MATH,
       LIB_HTML,];
 
+  final resource.MemoryResourceProvider provider =
+      new resource.MemoryResourceProvider();
+
   MockSdk() {
     LIBRARIES.forEach((_MockSdkLibrary library) {
       provider.newFile(library.path, library.content);
     });
   }
 
-  // Not used
   @override
   AnalysisContext get context => throw unimplemented;
 
   @override
   List<SdkLibrary> get sdkLibraries => LIBRARIES;
 
   @override
   String get sdkVersion => throw unimplemented;
 
   UnimplementedError get unimplemented => new UnimplementedError();
 
   @override
   List<String> get uris => throw unimplemented;
 
-  // Not used.
   @override
-  Source fromEncoding(UriKind kind, Uri uri) {
+  Source fromFileUri(Uri uri) {
     resource.Resource file = provider.getResource(uri.path);
     if (file is resource.File) {
-      return file.createSource(kind);
+      return file.createSource(uri);
     }
     return null;
   }
 
-  // Not used.
   @override
   SdkLibrary getSdkLibrary(String dartUri) {
     // getSdkLibrary() is only used to determine whether a library is internal
     // to the SDK.  The mock SDK doesn't have any internals, so it's safe to
     // return null.
     return null;
   }
 
-  // Not used.
   @override
   Source mapDartUri(String dartUri) {
     const Map<String, String> uriToPath = const {
       "dart:core": "/lib/core/core.dart",
       "dart:html": "/lib/html/dartium/html_dartium.dart",
       "dart:async": "/lib/async/async.dart",
       "dart:math": "/lib/math/math.dart"
     };
 
     String path = uriToPath[dartUri];
     if (path != null) {
       resource.File file = provider.getResource(path);
-      return file.createSource(UriKind.DART_URI);
+      Uri uri = new Uri(scheme: 'dart', path: dartUri.substring(5));
+      return file.createSource(uri);
     }
 
     // If we reach here then we tried to use a dartUri that's not in the
     // table above.
     throw unimplemented;
   }
 }
 
 
 class _MockSdkLibrary implements SdkLibrary {
@@ skipping 19 matching lines @@
   bool get isInternal => throw unimplemented;
 
   @override
   bool get isShared => throw unimplemented;
 
   @override
   bool get isVmLibrary => throw unimplemented;
 
   UnimplementedError get unimplemented => new UnimplementedError();
 }