Change MatchState to Map.

pkg/http/test/utils.dart

 // Copyright (c) 2013, 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 test_utils;
 
 import 'dart:async';
 import 'dart:io';
 import 'dart:json' as json;
 
@@ skipping 131 matching lines @@
 
 /// A matcher that matches JSON that parses to a value that matches the inner
 /// matcher.
 Matcher parse(matcher) => new _Parse(matcher);
 
 class _Parse extends BaseMatcher {
   final Matcher _matcher;
 
   _Parse(this._matcher);
 
-  bool matches(item, MatchState matchState) {
+  bool matches(item, Map matchState) {
     if (item is! String) return false;
 
     var parsed;
     try {
       parsed = json.parse(item);
     } catch (e) {
       return false;
     }
 
     return _matcher.matches(parsed, matchState);
   }
 
   Description describe(Description description) {
     return description.add('parses to a value that ')
       .addDescriptionOf(_matcher);
   }
 }
 
 /// A matcher for HttpExceptions.
 const isHttpException = const _HttpException();
 
 /// A matcher for functions that throw HttpException.
 const Matcher throwsHttpException =
     const Throws(isHttpException);
 
 class _HttpException extends TypeMatcher {
   const _HttpException() : super("HttpException");
-  bool matches(item, MatchState matchState) => item is HttpException;
+  bool matches(item, Map matchState) => item is HttpException;
 }
 
 /// A matcher for RedirectLimitExceededExceptions.
 const isRedirectLimitExceededException =
     const _RedirectLimitExceededException();
 
 /// A matcher for functions that throw RedirectLimitExceededException.
 const Matcher throwsRedirectLimitExceededException =
     const Throws(isRedirectLimitExceededException);
 
 class _RedirectLimitExceededException extends TypeMatcher {
   const _RedirectLimitExceededException() :
       super("RedirectLimitExceededException");
 
-  bool matches(item, MatchState matchState) =>
+  bool matches(item, Map matchState) =>
     item is RedirectException && item.message == "Redirect limit exceeded";
 }
 
 /// A matcher for SocketExceptions.
 const isSocketException = const _SocketException();
 
 /// A matcher for functions that throw SocketException.
 const Matcher throwsSocketException =
     const Throws(isSocketException);
 
 class _SocketException extends TypeMatcher {
   const _SocketException() : super("SocketException");
-  bool matches(item, MatchState matchState) => item is SocketException;
+  bool matches(item, Map matchState) => item is SocketException;
 }