From 6563b0de3453142bed6d8cee3232d3fbebc57b3c Mon Sep 17 00:00:00 2001
From: Leaf Petersen <leafpetersen@users.noreply.github.com>
Date: Tue, 24 Mar 2020 23:02:41 -0700
Subject: [PATCH] Revert "Replace uses of deprecated CastError with TypeError
 (#53221)" (#53226)

This reverts commit 6c7c2e372ae6cbf20c6601f4eb11f9cbfb09b591.
---
 packages/flutter/test/services/platform_channel_test.dart     | 4 ++--
 .../lib/src/build_system/targets/icon_tree_shaker.dart        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/flutter/test/services/platform_channel_test.dart b/packages/flutter/test/services/platform_channel_test.dart
index a1bae5576da..f318edbc0b2 100644
--- a/packages/flutter/test/services/platform_channel_test.dart
+++ b/packages/flutter/test/services/platform_channel_test.dart
@@ -70,7 +70,7 @@ void main() {
           }
         },
       );
-      expect(channel.invokeMethod<List<String>>('sayHello', 'hello'), throwsA(isInstanceOf<TypeError>()));
+      expect(channel.invokeMethod<List<String>>('sayHello', 'hello'), throwsA(isCastError));
       expect(await channel.invokeListMethod<String>('sayHello', 'hello'), <String>['hello', 'world']);
     });
 
@@ -102,7 +102,7 @@ void main() {
           }
         },
       );
-      expect(channel.invokeMethod<Map<String, String>>('sayHello', 'hello'), throwsA(isInstanceOf<TypeError>()));
+      expect(channel.invokeMethod<Map<String, String>>('sayHello', 'hello'), throwsA(isCastError));
       expect(await channel.invokeMapMethod<String, String>('sayHello', 'hello'), <String, String>{'hello': 'world'});
     });
 
diff --git a/packages/flutter_tools/lib/src/build_system/targets/icon_tree_shaker.dart b/packages/flutter_tools/lib/src/build_system/targets/icon_tree_shaker.dart
index 5f6a75c5668..8e85481264b 100644
--- a/packages/flutter_tools/lib/src/build_system/targets/icon_tree_shaker.dart
+++ b/packages/flutter_tools/lib/src/build_system/targets/icon_tree_shaker.dart
@@ -25,7 +25,7 @@ const bool kIconTreeShakerEnabledDefault = false;
 List<Map<String, dynamic>> _getList(dynamic object, String errorMessage) {
   try {
     return (object as List<dynamic>).cast<Map<String, dynamic>>();
-  } on TypeError catch (_) {
+  } on CastError catch (_) {
     throw IconTreeShakerException._(errorMessage);
   }
 }