update DDC to use analyzer extractDefinedVariables

pkg/dev_compiler/test/codegen_test.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.
 
 /// Tests code generation.
 ///
 /// Runs Dart Dev Compiler on all input in the `codegen` directory and checks
 /// that the output is what we expected.
 library dev_compiler.test.codegen_test;
 
 // TODO(rnystrom): This doesn't actually run any tests any more. It just
 // compiles stuff. This should be changed to not use unittest and just be a
 // regular program that outputs files.
 
 import 'dart:io' show Directory, File, Platform;
 import 'package:analyzer/analyzer.dart'
     show
         ExportDirective,
         ImportDirective,
         StringLiteral,
         UriBasedDirective,
         parseDirectives;
+import 'package:analyzer/src/command_line/arguments.dart'
+    show extractDefinedVariables;
 import 'package:analyzer/src/dart/ast/ast.dart';
 import 'package:analyzer/src/generated/source.dart' show Source;
 import 'package:args/args.dart' show ArgParser, ArgResults;
-import 'package:dev_compiler/src/analyzer/context.dart'
-    show AnalyzerOptions, parseDeclaredVariables;
+import 'package:dev_compiler/src/analyzer/context.dart';
 import 'package:dev_compiler/src/compiler/compiler.dart'
     show BuildUnit, CompilerOptions, JSModuleFile, ModuleCompiler;
 import 'package:dev_compiler/src/compiler/module_builder.dart'
     show ModuleFormat, addModuleFormatOptions, parseModuleFormatOption;
 import 'package:path/path.dart' as path;
 import 'package:test/test.dart' show expect, isFalse, isTrue, test;
 
 import '../tool/build_sdk.dart' as build_sdk;
 import 'testing.dart' show repoDirectory, testDirectory;
 import 'multitest.dart' show extractTestsFromMultitest, isMultiTest;
@@ skipping 94 matching lines @@
       var match = testFileOptionsMatcher.firstMatch(contents);
 
       var args = defaultOptions.toList();
       if (match != null) {
         var matchedArgs = match.group(2).split(' ');
         args.addAll(matchedArgs.where((s) => !ignoreOptions.contains(s)));
       }
 
       var declaredVars = <String, String>{};
       var argResults =
-          compileArgParser.parse(parseDeclaredVariables(args, declaredVars));
+          compileArgParser.parse(extractDefinedVariables(args, declaredVars));
       var options = new CompilerOptions.fromArguments(argResults);
       var moduleFormat = parseModuleFormatOption(argResults).first;
 
       // Collect any other files we've imported.
       var files = new Set<String>();
       _collectTransitiveImports(contents, files, from: testFile);
       var unit = new BuildUnit(
           name, path.dirname(testFile), files.toList(), _moduleForLibrary);
 
       var compiler = sharedCompiler;
@@ skipping 203 matching lines @@
   StringLiteral uriLiteral = directive.uri;
   String uriContent = uriLiteral.stringValue;
   if (uriContent != null) {
     uriContent = uriContent.trim();
     directive.uriContent = uriContent;
   }
   return (directive as UriBasedDirectiveImpl).validate() == null
       ? uriContent
       : null;
 }