Split out options from ContextBuilder

pkg/analyzer/test/stress/for_git_repository.dart

 // Copyright (c) 2016, 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 analyzer.test.stress.limited_invalidation;
 
 import 'dart:async';
 import 'dart:io';
 
 import 'package:analyzer/dart/ast/ast.dart';
@@ skipping 228 matching lines @@
 
   void createContexts() {
     assert(expectedContext == null);
     assert(actualContext == null);
     resourceProvider = PhysicalResourceProvider.INSTANCE;
     pathContext = resourceProvider.pathContext;
     fs.Folder sdkDirectory =
         FolderBasedDartSdk.defaultSdkDirectory(resourceProvider);
     sdkManager = new DartSdkManager(sdkDirectory.path, false);
     contentCache = new ContentCache();
-    ContextBuilder builder =
-        new ContextBuilder(resourceProvider, sdkManager, contentCache);
-    builder.defaultOptions = new AnalysisOptionsImpl();
+    ContextBuilderOptions builderOptions = new ContextBuilderOptions();
+    builderOptions.defaultOptions = new AnalysisOptionsImpl();
+    ContextBuilder builder = new ContextBuilder(
+        resourceProvider, sdkManager, contentCache,
+        options: builderOptions);
     expectedContext = builder.buildContext(folderPath);
     actualContext = builder.buildContext(folderPath);
     expectedContext.analysisOptions =
         new AnalysisOptionsImpl.from(expectedContext.analysisOptions)
           ..incremental = true;
     actualContext.analysisOptions =
         new AnalysisOptionsImpl.from(actualContext.analysisOptions)
           ..incremental = true
           ..finerGrainedInvalidation = true;
     print('Created contexts');
@@ skipping 365 matching lines @@
             pairwiseCompare(expectedArguments, (a, b) {
               _verifyTypes(a, b, '$desc typeArguments');
               return true;
             }, 'elements'));
       } else {
         _failTypeMismatch(actual, expected);
       }
     }
   }
 }