Cleanup MatchState in pub.

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

 // Copyright (c) 2012, 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 pub_update_test;
 
 import 'dart:async';
 import 'dart:io';
 
 import 'package:unittest/unittest.dart';
@@ skipping 936 matching lines @@
   SolveSuccessMatcher(this._expected, this._maxTries);
 
   Description describe(Description description) {
     return description.add(
         'Solver to use at most $_maxTries attempts to find:\n'
         '${_listPackages(_expected.values)}');
   }
 
   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;
     }
 
     description.add('Resolved:\n${_listPackages(result.packages)}\n');
     description.add(state.state);
     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);
     var failures = new StringBuffer();
 
     for (var id in result.packages) {
       if (!expected.containsKey(id.name)) {
         failures.writeln('Should not have selected $id');
       } else {
         var expectedId = expected.remove(id.name);
@@ skipping 44 matching lines @@
     description.add('Solver should fail after at most $_maxTries attempts.');
     if (!_expected.isEmpty) {
       var textList = _expected.map((s) => '"$s"').join(", ");
       description.add(' The error should contain $textList.');
     }
     return description;
   }
 
   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) {
       failures.writeln('Solver succeeded');
     } else {
       if (_expectedType != null && result.error.runtimeType != _expectedType) {
         failures.writeln('Should have error type $_expectedType, got '
             '${result.error.runtimeType}');
       }
 
@@ skipping 142 matching lines @@
   var source = "mock1";
   var match = new RegExp(r"(.*) from (.*)").firstMatch(description);
   if (match != null) {
     name = match[1];
     source = match[2];
     if (source == "root") source = null;
   }
 
   callback(isDev, name, source);
 }