Split out options from ContextBuilder

pkg/analysis_server/test/context_manager_test.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 test.context.directory.manager;
 
 import 'dart:collection';
 
 import 'package:analysis_server/src/context_manager.dart';
 import 'package:analyzer/error/error.dart';
@@ skipping 2689 matching lines @@
   }
 
   @override
   void computingPackageMap(bool computing) {
     // Do nothing.
   }
 
   @override
   ContextBuilder createContextBuilder(Folder folder, AnalysisOptions options) {
     DartSdkManager sdkManager = new DartSdkManager('/', false);
-    ContextBuilder builder =
-        new ContextBuilder(resourceProvider, sdkManager, new ContentCache());
-    builder.defaultOptions = options;
+    ContextBuilderOptions builderOptions = new ContextBuilderOptions();
+    builderOptions.defaultOptions = options;
+    ContextBuilder builder = new ContextBuilder(
+        resourceProvider, sdkManager, new ContentCache(),
+        options: builderOptions);
     return builder;
   }
 
   @override
   void moveContext(Folder from, Folder to) {
     String path = from.path;
     String path2 = to.path;
     expect(currentContextFilePaths, contains(path));
     expect(currentContextTimestamps, contains(path));
     expect(currentContextSources, contains(path));
@@ skipping 34 matching lines @@
 class TestUriResolver extends UriResolver {
   Map<Uri, Source> uriMap;
 
   TestUriResolver(this.uriMap);
 
   @override
   Source resolveAbsolute(Uri uri, [Uri actualUri]) {
     return uriMap[uri];
   }
 }