Split out options from ContextBuilder

pkg/dev_compiler/lib/src/analyzer/context.dart

 // Copyright (c) 2015, 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.
 
 import 'package:args/args.dart' show ArgParser, ArgResults;
 import 'package:analyzer/file_system/file_system.dart'
     show ResourceProvider, ResourceUriResolver;
 import 'package:analyzer/file_system/physical_file_system.dart'
     show PhysicalResourceProvider;
 import 'package:analyzer/source/custom_resolver.dart';
@@ skipping 121 matching lines @@
     fileResolvers =
         createFileResolvers(options, resourceProvider: resourceProvider);
   resolvers.addAll(fileResolvers);
   return new SourceFactory(resolvers, null, resourceProvider);
 }
 
 List<UriResolver> createFileResolvers(AnalyzerOptions options,
     {ResourceProvider resourceProvider}) {
   resourceProvider ??= PhysicalResourceProvider.INSTANCE;
   UriResolver packageResolver() {
-    ContextBuilder builder = new ContextBuilder(resourceProvider, null, null);
+    ContextBuilderOptions builderOptions = new ContextBuilderOptions();
     if (options.packageRoot != null) {
-      builder.defaultPackagesDirectoryPath = options.packageRoot;
+      builderOptions.defaultPackagesDirectoryPath = options.packageRoot;
     }
+    ContextBuilder builder = new ContextBuilder(resourceProvider, null, null,
+        options: builderOptions);
     return new PackageMapUriResolver(resourceProvider,
         builder.convertPackagesToMap(builder.createPackageMap('')));
   }
 
   return [
     new ResourceUriResolver(resourceProvider),
     options.useMultiPackage
         ? new MultiPackageResolver(options.packagePaths)
         : packageResolver()
   ];
 }
 
 FolderBasedDartSdk _createFolderBasedDartSdk(String sdkPath) {
   var resourceProvider = PhysicalResourceProvider.INSTANCE;
   var sdk = new FolderBasedDartSdk(resourceProvider,
       resourceProvider.getFolder(sdkPath), /*useDart2jsPaths:*/ true);
   sdk.useSummary = true;
   sdk.analysisOptions = new AnalysisOptionsImpl()..strongMode = true;
   return sdk;
 }
 
 /// Creates a [DartUriResolver] that uses the SDK at the given [sdkPath].
 DartUriResolver createSdkPathResolver(String sdkSummaryPath, String sdkPath) {
   var sdk = (sdkSummaryPath != null)
       ? new SummaryBasedDartSdk(sdkSummaryPath, true)
       : _createFolderBasedDartSdk(sdkPath);
   return new DartUriResolver(sdk);
 }