Add DeclaredVariables to AnalysisDriver.

pkg/analyzer/test/src/dart/constant/evaluation_test.dart

Index: pkg/analyzer/test/src/dart/constant/evaluation_test.dart
diff --git a/pkg/analyzer/test/src/dart/constant/evaluation_test.dart b/pkg/analyzer/test/src/dart/constant/evaluation_test.dart
index 5d0bb3204dc0d08833704395881c5d95ac5c0c10..2be471d17a7f437fc8a6a329c9557773767ac698 100644
--- a/pkg/analyzer/test/src/dart/constant/evaluation_test.dart
+++ b/pkg/analyzer/test/src/dart/constant/evaluation_test.dart
@@ -1265,7 +1265,12 @@ const A a = const A();
     String envVarName = "x";
     String varName = "foo";
     if (valueInEnvironment != null) {
-      analysisContext2.declaredVariables.define(envVarName, valueInEnvironment);
+      if (enableNewAnalysisDriver) {
+        driver.declaredVariables.define(envVarName, valueInEnvironment);
+      } else {
+        analysisContext2.declaredVariables
+            .define(envVarName, valueInEnvironment);
+      }
     }
     String defaultArg =
         defaultExpr == null ? "" : ", defaultValue: $defaultExpr";
@@ -1279,7 +1284,12 @@ const A a = const A();
     String envVarName = "x";
     String varName = "foo";
     if (valueInEnvironment != null) {
-      analysisContext2.declaredVariables.define(envVarName, valueInEnvironment);
+      if (enableNewAnalysisDriver) {
+        driver.declaredVariables.define(envVarName, valueInEnvironment);
+      } else {
+        analysisContext2.declaredVariables
+            .define(envVarName, valueInEnvironment);
+      }
     }
     String defaultArg =
         defaultExpr == null ? "" : ", defaultValue: $defaultExpr";
@@ -1293,7 +1303,12 @@ const A a = const A();
     String envVarName = "x";
     String varName = "foo";
     if (valueInEnvironment != null) {
-      analysisContext2.declaredVariables.define(envVarName, valueInEnvironment);
+      if (enableNewAnalysisDriver) {
+        driver.declaredVariables.define(envVarName, valueInEnvironment);
+      } else {
+        analysisContext2.declaredVariables
+            .define(envVarName, valueInEnvironment);
+      }
     }
     String defaultArg =
         defaultExpr == null ? "" : ", defaultValue: $defaultExpr";