Embedder support refactoring (phase 1).

pkg/analysis_server/lib/src/context_manager.dart

Index: pkg/analysis_server/lib/src/context_manager.dart
diff --git a/pkg/analysis_server/lib/src/context_manager.dart b/pkg/analysis_server/lib/src/context_manager.dart
index 44c3595a8a48b6a15d2afa89a2c7f2dc5a786f48..975cd09ceb73a9fa1a53576ed2254e2c445d4702 100644
--- a/pkg/analysis_server/lib/src/context_manager.dart
+++ b/pkg/analysis_server/lib/src/context_manager.dart
@@ -917,7 +917,8 @@ class ContextManagerImpl implements ContextManager {
                   .where((r) => r is! DartUriResolver)
                   .toList();
               // Add an embedded URI resolver in its place.
-              resolvers.add(new EmbedderUriResolver(embedderYamls));
+              resolvers
+                  .add(new EmbedderUriResolver(new EmbedderSdk(embedderYamls)));
 
               // Set a new source factory.
               SourceFactoryImpl newFactory = sourceFactory.clone();
@@ -1174,8 +1175,8 @@ class ContextManagerImpl implements ContextManager {
     }
 
     // If no embedded URI resolver was provided, defer to a locator-backed one.
-    embedderUriResolver ??=
-        new EmbedderUriResolver(context.embedderYamlLocator.embedderYamls);
+    embedderUriResolver ??= new EmbedderUriResolver(
+        new EmbedderSdk(context.embedderYamlLocator.embedderYamls));
     if (embedderUriResolver.length == 0) {
       // The embedder uri resolver has no mappings. Use the default Dart SDK
       // uri resolver.