Refactor creating AnalysisOptionsImpl and declared variables.

pkg/analyzer_cli/lib/src/build_mode.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.
 
 library analyzer_cli.src.build_mode;
 
 import 'dart:io' as io;
 
 import 'package:analyzer/dart/ast/ast.dart' show CompilationUnit;
 import 'package:analyzer/error/error.dart';
@@ skipping 307 matching lines @@
 
     // Create the context.
     context = AnalysisEngine.instance.createAnalysisContext();
     context.sourceFactory = new SourceFactory(<UriResolver>[
       new DartUriResolver(sdk),
       new InSummaryUriResolver(resourceProvider, summaryDataStore),
       new ExplicitSourceResolver(uriToFileMap)
     ]);
 
     // Set context options.
-    Driver.setAnalysisContextOptions(resourceProvider, context, options);
+    Driver.declareVariables(context.declaredVariables, options);
+    AnalysisOptionsImpl analysisOptions = Driver
+        .createAnalysisOptionsForCommandLineOptions(resourceProvider, options);
+    context.analysisOptions = analysisOptions;
 
     if (!options.buildSummaryOnly) {
       // Configure using summaries.
       context.typeProvider = sdk.context.typeProvider;
       context.resultProvider =
           new InputPackagesResultProvider(context, summaryDataStore);
     }
   }
 
   /**
@@ skipping 132 matching lines @@
    * Build the inverse mapping of [uriToSourceMap].
    */
   static Map<String, Uri> _computePathToUriMap(Map<Uri, File> uriToSourceMap) {
     Map<String, Uri> pathToUriMap = <String, Uri>{};
     uriToSourceMap.forEach((Uri uri, File file) {
       pathToUriMap[file.path] = uri;
     });
     return pathToUriMap;
   }
 }