Cleanup MatchState in pub.

sdk/lib/_internal/pub/test/version_solver_test.dart

Index: sdk/lib/_internal/pub/test/version_solver_test.dart
===================================================================
--- sdk/lib/_internal/pub/test/version_solver_test.dart	(revision 24041)
+++ sdk/lib/_internal/pub/test/version_solver_test.dart	(working copy)
@@ -954,7 +954,7 @@
 
   Description describeMismatch(SolveResult result,
                                Description description,
-                               MatchState state, bool verbose) {
+                               Map state, bool verbose) {
     if (!result.succeeded) {
       description.add('Solver failed with:\n${result.error}');
       return null;
@@ -965,7 +965,7 @@
     return description;
   }
 
-  bool matches(SolveResult result, MatchState state) {
+  bool matches(SolveResult result, Map state) {
     if (!result.succeeded) return false;
 
     var expected = new Map.from(_expected);
@@ -1030,12 +1030,12 @@
 
   Description describeMismatch(SolveResult result,
                                Description description,
-                               MatchState state, bool verbose) {
+                               Map state, bool verbose) {
     description.add(state.state);
     return description;
   }
 
-  bool matches(SolveResult result, MatchState state) {
+  bool matches(SolveResult result, Map state) {
     var failures = new StringBuffer();
 
     if (result.succeeded) {