From a2d062541669dca38281d976efbecf57079641a1 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Fri, 26 Feb 2021 14:23:00 -0800
Subject: [PATCH 1/9] it on sdk

---
 packages/connectivity/connectivity/pubspec.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/connectivity/connectivity/pubspec.yaml b/packages/connectivity/connectivity/pubspec.yaml
index 254e325203d1..a66609b6bf28 100644
--- a/packages/connectivity/connectivity/pubspec.yaml
+++ b/packages/connectivity/connectivity/pubspec.yaml
@@ -32,9 +32,9 @@ dev_dependencies:
     sdk: flutter
   flutter_driver:
     sdk: flutter
-  test: ^1.16.3
   integration_test:
-    path: ../../integration_test
+    sdk: flutter
+  test: ^1.16.3
   plugin_platform_interface: ">=1.0.0 <3.0.0"
   pedantic: ^1.10.0
 

From 9ff680598caf548fdf6a7777433955e91616ac79 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Fri, 26 Feb 2021 14:32:20 -0800
Subject: [PATCH 2/9] migrate integration tests to null safety

---
 packages/connectivity/connectivity/example/pubspec.yaml      | 4 ++--
 .../test_driver/integration_test/connectivity_test.dart      | 5 +----
 .../example/test_driver/test/integration_test.dart           | 4 ----
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/packages/connectivity/connectivity/example/pubspec.yaml b/packages/connectivity/connectivity/example/pubspec.yaml
index 6395dc38c3ae..7f479e56ee12 100644
--- a/packages/connectivity/connectivity/example/pubspec.yaml
+++ b/packages/connectivity/connectivity/example/pubspec.yaml
@@ -15,9 +15,9 @@ dependencies:
 dev_dependencies:
   flutter_driver:
     sdk: flutter
-  test: ^1.16.3
   integration_test:
-    path: ../../../integration_test
+    sdk: flutter
+  test: ^1.16.3
   pedantic: ^1.10.0
 
 flutter:
diff --git a/packages/connectivity/connectivity/example/test_driver/integration_test/connectivity_test.dart b/packages/connectivity/connectivity/example/test_driver/integration_test/connectivity_test.dart
index 3177b66ea48a..a516ccacd49e 100644
--- a/packages/connectivity/connectivity/example/test_driver/integration_test/connectivity_test.dart
+++ b/packages/connectivity/connectivity/example/test_driver/integration_test/connectivity_test.dart
@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(cyanglaz): Remove once https://github.com/flutter/plugins/pull/3158 is landed.
-// @dart = 2.9
-
 import 'package:integration_test/integration_test.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:connectivity/connectivity.dart';
@@ -13,7 +10,7 @@ void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
   group('Connectivity test driver', () {
-    Connectivity _connectivity;
+    late Connectivity _connectivity;
 
     setUpAll(() async {
       _connectivity = Connectivity();
diff --git a/packages/connectivity/connectivity/example/test_driver/test/integration_test.dart b/packages/connectivity/connectivity/example/test_driver/test/integration_test.dart
index 33421c335bdd..c0cbdcab2fb6 100644
--- a/packages/connectivity/connectivity/example/test_driver/test/integration_test.dart
+++ b/packages/connectivity/connectivity/example/test_driver/test/integration_test.dart
@@ -2,10 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(amirh): Remove this once flutter_driver supports null safety.
-// https://github.com/flutter/flutter/issues/71379
-// @dart = 2.9
-
 import 'dart:convert';
 import 'dart:io';
 import 'package:flutter_driver/flutter_driver.dart';

From a9bebe0ff1892423d04b59c2520377f8fc40f7ce Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Fri, 26 Feb 2021 14:37:39 -0800
Subject: [PATCH 3/9] device info

---
 .../example/integration_test/device_info_test.dart         | 7 ++-----
 packages/device_info/device_info/example/pubspec.yaml      | 2 +-
 .../device_info/example/test_driver/integration_test.dart  | 3 ---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/packages/device_info/device_info/example/integration_test/device_info_test.dart b/packages/device_info/device_info/example/integration_test/device_info_test.dart
index 61c4396b0d8e..b1f016fa732c 100644
--- a/packages/device_info/device_info/example/integration_test/device_info_test.dart
+++ b/packages/device_info/device_info/example/integration_test/device_info_test.dart
@@ -2,9 +2,6 @@
 // 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.
 
-// TODO(cyanglaz): Remove once https://github.com/flutter/plugins/pull/3158 is landed.
-// @dart = 2.9
-
 import 'dart:io';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:device_info/device_info.dart';
@@ -13,8 +10,8 @@ import 'package:integration_test/integration_test.dart';
 void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
-  IosDeviceInfo iosInfo;
-  AndroidDeviceInfo androidInfo;
+  late IosDeviceInfo iosInfo;
+  late AndroidDeviceInfo androidInfo;
 
   setUpAll(() async {
     final DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin();
diff --git a/packages/device_info/device_info/example/pubspec.yaml b/packages/device_info/device_info/example/pubspec.yaml
index bc7d00ef87f0..36b6d6e9441c 100644
--- a/packages/device_info/device_info/example/pubspec.yaml
+++ b/packages/device_info/device_info/example/pubspec.yaml
@@ -16,7 +16,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test:
-    path: ../../../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 flutter:
diff --git a/packages/device_info/device_info/example/test_driver/integration_test.dart b/packages/device_info/device_info/example/test_driver/integration_test.dart
index 13327bb884c9..7a2c21338786 100644
--- a/packages/device_info/device_info/example/test_driver/integration_test.dart
+++ b/packages/device_info/device_info/example/test_driver/integration_test.dart
@@ -2,9 +2,6 @@
 // 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.
 
-// TODO(cyanglaz): Remove once https://github.com/flutter/flutter/issues/59879 is fixed.
-// @dart = 2.9
-
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';

From 06c7131f0903bdd5b798cd7a41f3365a83051a4b Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Fri, 26 Feb 2021 14:42:54 -0800
Subject: [PATCH 4/9] image_picker it

---
 packages/connectivity/connectivity/pubspec.yaml          | 2 --
 packages/image_picker/image_picker/example/pubspec.yaml  | 2 +-
 .../test_driver/integration_test/image_picker_test.dart  | 9 +++++++++
 .../integration_test/old_image_picker_test.dart          | 7 -------
 packages/image_picker/image_picker/pubspec.yaml          | 2 --
 5 files changed, 10 insertions(+), 12 deletions(-)
 create mode 100644 packages/image_picker/image_picker/example/test_driver/integration_test/image_picker_test.dart
 delete mode 100644 packages/image_picker/image_picker/integration_test/old_image_picker_test.dart

diff --git a/packages/connectivity/connectivity/pubspec.yaml b/packages/connectivity/connectivity/pubspec.yaml
index a66609b6bf28..b3e6cee88674 100644
--- a/packages/connectivity/connectivity/pubspec.yaml
+++ b/packages/connectivity/connectivity/pubspec.yaml
@@ -32,8 +32,6 @@ dev_dependencies:
     sdk: flutter
   flutter_driver:
     sdk: flutter
-  integration_test:
-    sdk: flutter
   test: ^1.16.3
   plugin_platform_interface: ">=1.0.0 <3.0.0"
   pedantic: ^1.10.0
diff --git a/packages/image_picker/image_picker/example/pubspec.yaml b/packages/image_picker/image_picker/example/pubspec.yaml
index ceafc317fa82..68b70b909162 100755
--- a/packages/image_picker/image_picker/example/pubspec.yaml
+++ b/packages/image_picker/image_picker/example/pubspec.yaml
@@ -19,7 +19,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test:
-    path: ../../../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 flutter:
diff --git a/packages/image_picker/image_picker/example/test_driver/integration_test/image_picker_test.dart b/packages/image_picker/image_picker/example/test_driver/integration_test/image_picker_test.dart
new file mode 100644
index 000000000000..c28ca3fff873
--- /dev/null
+++ b/packages/image_picker/image_picker/example/test_driver/integration_test/image_picker_test.dart
@@ -0,0 +1,9 @@
+// Copyright 2019, the Chromium 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.
+
+import 'package:integration_test/integration_test.dart';
+
+void main() {
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+}
diff --git a/packages/image_picker/image_picker/integration_test/old_image_picker_test.dart b/packages/image_picker/image_picker/integration_test/old_image_picker_test.dart
deleted file mode 100644
index 76c971c2881b..000000000000
--- a/packages/image_picker/image_picker/integration_test/old_image_picker_test.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart=2.9
-
-import 'package:integration_test/integration_test.dart';
-
-void main() {
-  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-}
diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml
index 96881e6f2c65..e1ce0764ec61 100755
--- a/packages/image_picker/image_picker/pubspec.yaml
+++ b/packages/image_picker/image_picker/pubspec.yaml
@@ -22,8 +22,6 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  integration_test:
-    path: ../../integration_test
   mockito: ^5.0.0-nullsafety.7
   pedantic: ^1.10.0
   plugin_platform_interface: ">=1.0.0 <3.0.0"

From 42d4d241beed94ee0ad8e4be09eddb4c516fce9d Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Fri, 26 Feb 2021 14:44:25 -0800
Subject: [PATCH 5/9] in app purchase

---
 packages/in_app_purchase/example/pubspec.yaml                   | 2 +-
 .../test_driver}/integration_test/in_app_purchase_test.dart     | 1 -
 .../example/test_driver/test/integration_test.dart              | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)
 rename packages/in_app_purchase/{ => example/test_driver}/integration_test/in_app_purchase_test.dart (97%)

diff --git a/packages/in_app_purchase/example/pubspec.yaml b/packages/in_app_purchase/example/pubspec.yaml
index 8c9296dc98c8..8d193debb826 100644
--- a/packages/in_app_purchase/example/pubspec.yaml
+++ b/packages/in_app_purchase/example/pubspec.yaml
@@ -18,7 +18,7 @@ dev_dependencies:
     # the parent directory to use the current plugin's version.
     path: ../
   integration_test:
-    path: ../../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 flutter:
diff --git a/packages/in_app_purchase/integration_test/in_app_purchase_test.dart b/packages/in_app_purchase/example/test_driver/integration_test/in_app_purchase_test.dart
similarity index 97%
rename from packages/in_app_purchase/integration_test/in_app_purchase_test.dart
rename to packages/in_app_purchase/example/test_driver/integration_test/in_app_purchase_test.dart
index aa3430fbc7d2..a5bfdb0eb409 100644
--- a/packages/in_app_purchase/integration_test/in_app_purchase_test.dart
+++ b/packages/in_app_purchase/example/test_driver/integration_test/in_app_purchase_test.dart
@@ -2,7 +2,6 @@
 // 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.
 
-// @dart = 2.9
 import 'package:flutter_test/flutter_test.dart';
 import 'package:in_app_purchase/in_app_purchase.dart';
 import 'package:integration_test/integration_test.dart';
diff --git a/packages/in_app_purchase/example/test_driver/test/integration_test.dart b/packages/in_app_purchase/example/test_driver/test/integration_test.dart
index 0352d4aaeb2d..7a2c21338786 100644
--- a/packages/in_app_purchase/example/test_driver/test/integration_test.dart
+++ b/packages/in_app_purchase/example/test_driver/test/integration_test.dart
@@ -2,7 +2,6 @@
 // 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.
 
-// @dart = 2.9
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';

From 413f3442f6b0c42de57919eb9bb8b03e2b9e01fb Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Fri, 26 Feb 2021 14:47:02 -0800
Subject: [PATCH 6/9] quick action it

---
 .../example/integration_test/quick_actions_test.dart           | 3 +--
 packages/quick_actions/example/pubspec.yaml                    | 2 +-
 .../quick_actions/example/test_driver/integration_test.dart    | 1 -
 packages/quick_actions/pubspec.yaml                            | 2 --
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/quick_actions/example/integration_test/quick_actions_test.dart b/packages/quick_actions/example/integration_test/quick_actions_test.dart
index 43822c9e8b2b..9c166bf76ef4 100644
--- a/packages/quick_actions/example/integration_test/quick_actions_test.dart
+++ b/packages/quick_actions/example/integration_test/quick_actions_test.dart
@@ -2,7 +2,6 @@
 // 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.
 
-// @dart = 2.9
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:quick_actions/quick_actions.dart';
@@ -12,7 +11,7 @@ void main() {
 
   testWidgets('Can set shortcuts', (WidgetTester tester) async {
     final QuickActions quickActions = QuickActions();
-    quickActions.initialize(null);
+    quickActions.initialize((String shortcutType) => {});
 
     const ShortcutItem shortCutItem = ShortcutItem(
       type: 'action_one',
diff --git a/packages/quick_actions/example/pubspec.yaml b/packages/quick_actions/example/pubspec.yaml
index ded88685c41b..b26f8432e9ad 100644
--- a/packages/quick_actions/example/pubspec.yaml
+++ b/packages/quick_actions/example/pubspec.yaml
@@ -16,7 +16,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test:
-    path: ../../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 flutter:
diff --git a/packages/quick_actions/example/test_driver/integration_test.dart b/packages/quick_actions/example/test_driver/integration_test.dart
index 0352d4aaeb2d..7a2c21338786 100644
--- a/packages/quick_actions/example/test_driver/integration_test.dart
+++ b/packages/quick_actions/example/test_driver/integration_test.dart
@@ -2,7 +2,6 @@
 // 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.
 
-// @dart = 2.9
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
diff --git a/packages/quick_actions/pubspec.yaml b/packages/quick_actions/pubspec.yaml
index dc500e2516e1..0ea2e0eca9a6 100644
--- a/packages/quick_actions/pubspec.yaml
+++ b/packages/quick_actions/pubspec.yaml
@@ -22,8 +22,6 @@ dev_dependencies:
   test: ^1.16.3
   flutter_test:
     sdk: flutter
-  integration_test:
-    path: ../integration_test
   pedantic: ^1.10.0
 
 environment:

From 82b77fd7a64d050d1fa16c17feb8cf33333e4a1f Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Fri, 26 Feb 2021 14:51:15 -0800
Subject: [PATCH 7/9] webview

---
 .../webview_flutter_test.dart                 | 26 +++++++++----------
 packages/webview_flutter/example/pubspec.yaml |  2 +-
 .../example/test_driver/integration_test.dart |  2 --
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/packages/webview_flutter/example/integration_test/webview_flutter_test.dart b/packages/webview_flutter/example/integration_test/webview_flutter_test.dart
index 50af77fe6c6e..8e4038773fb0 100644
--- a/packages/webview_flutter/example/integration_test/webview_flutter_test.dart
+++ b/packages/webview_flutter/example/integration_test/webview_flutter_test.dart
@@ -2,8 +2,6 @@
 // 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.
 
-// @dart = 2.9
-
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
@@ -36,7 +34,7 @@ void main() {
       ),
     );
     final WebViewController controller = await controllerCompleter.future;
-    final String currentUrl = await controller.currentUrl();
+    final String? currentUrl = await controller.currentUrl();
     expect(currentUrl, 'https://flutter.dev/');
   });
 
@@ -57,7 +55,7 @@ void main() {
     );
     final WebViewController controller = await controllerCompleter.future;
     await controller.loadUrl('https://www.google.com/');
-    final String currentUrl = await controller.currentUrl();
+    final String? currentUrl = await controller.currentUrl();
     expect(currentUrl, 'https://www.google.com/');
   });
 
@@ -93,7 +91,7 @@ void main() {
     };
     await controller.loadUrl('https://flutter-header-echo.herokuapp.com/',
         headers: headers);
-    final String currentUrl = await controller.currentUrl();
+    final String? currentUrl = await controller.currentUrl();
     expect(currentUrl, 'https://flutter-header-echo.herokuapp.com/');
 
     await pageStarts.stream.firstWhere((String url) => url == currentUrl);
@@ -330,7 +328,7 @@ void main() {
   });
 
   group('Video playback policy', () {
-    String videoTestBase64;
+    late String videoTestBase64;
     setUpAll(() async {
       final ByteData videoData =
           await rootBundle.load('assets/sample_video.mp4');
@@ -543,7 +541,7 @@ void main() {
   });
 
   group('Audio playback policy', () {
-    String audioTestBase64;
+    late String audioTestBase64;
     setUpAll(() async {
       final ByteData audioData =
           await rootBundle.load('assets/sample_audio.ogg');
@@ -749,7 +747,7 @@ void main() {
     await pageStarted.future;
     await pageLoaded.future;
 
-    final String title = await controller.getTitle();
+    final String? title = await controller.getTitle();
     expect(title, 'Some title');
   });
 
@@ -937,7 +935,7 @@ void main() {
           .evaluateJavascript('location.href = "https://www.google.com/"');
 
       await pageLoads.stream.first; // Wait for the next page load.
-      final String currentUrl = await controller.currentUrl();
+      final String? currentUrl = await controller.currentUrl();
       expect(currentUrl, 'https://www.google.com/');
     });
 
@@ -1026,8 +1024,8 @@ void main() {
       // blocked. Still wait for a potential page change for some time in order
       // to give the test a chance to fail.
       await pageLoads.stream.first
-          .timeout(const Duration(milliseconds: 500), onTimeout: () => null);
-      final String currentUrl = await controller.currentUrl();
+          .timeout(const Duration(milliseconds: 500), onTimeout: () => '');
+      final String? currentUrl = await controller.currentUrl();
       expect(currentUrl, isNot(contains('youtube.com')));
     });
 
@@ -1064,7 +1062,7 @@ void main() {
           .evaluateJavascript('location.href = "https://www.google.com"');
 
       await pageLoads.stream.first; // Wait for second page to load.
-      final String currentUrl = await controller.currentUrl();
+      final String? currentUrl = await controller.currentUrl();
       expect(currentUrl, 'https://www.google.com/');
     });
   });
@@ -1091,7 +1089,7 @@ void main() {
       ),
     );
     final WebViewController controller = await controllerCompleter.future;
-    final String currentUrl = await controller.currentUrl();
+    final String? currentUrl = await controller.currentUrl();
     expect(currentUrl, 'https://flutter.dev/');
   });
 
@@ -1118,7 +1116,7 @@ void main() {
     final WebViewController controller = await controllerCompleter.future;
     await controller.evaluateJavascript('window.open("about:blank", "_blank")');
     await pageLoaded.future;
-    final String currentUrl = await controller.currentUrl();
+    final String? currentUrl = await controller.currentUrl();
     expect(currentUrl, 'about:blank');
   });
 
diff --git a/packages/webview_flutter/example/pubspec.yaml b/packages/webview_flutter/example/pubspec.yaml
index d7688b720f3f..b70674197901 100644
--- a/packages/webview_flutter/example/pubspec.yaml
+++ b/packages/webview_flutter/example/pubspec.yaml
@@ -21,7 +21,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test:
-    path: ../../integration_test
+    sdk: flutter
   pedantic: ^1.10.0
 
 flutter:
diff --git a/packages/webview_flutter/example/test_driver/integration_test.dart b/packages/webview_flutter/example/test_driver/integration_test.dart
index a8a56aa90f6a..7a2c21338786 100644
--- a/packages/webview_flutter/example/test_driver/integration_test.dart
+++ b/packages/webview_flutter/example/test_driver/integration_test.dart
@@ -2,8 +2,6 @@
 // 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.
 
-// @dart = 2.9
-
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';

From db273f0c9f1551b42d2087d611beef39206f2083 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Fri, 26 Feb 2021 14:52:38 -0800
Subject: [PATCH 8/9] wifi info flutter

---
 .../wifi_info_flutter/example/pubspec.yaml    |  2 +-
 .../integration_test/wifi_info_test.dart      |  3 +-
 .../test_driver/test/integration_test.dart    |  1 -
 .../integration_test/wifi_info_test.dart      | 29 -------------------
 .../wifi_info_flutter/pubspec.yaml            |  2 --
 5 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 packages/wifi_info_flutter/wifi_info_flutter/integration_test/wifi_info_test.dart

diff --git a/packages/wifi_info_flutter/wifi_info_flutter/example/pubspec.yaml b/packages/wifi_info_flutter/wifi_info_flutter/example/pubspec.yaml
index bd424859abf2..57edbe86daea 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/example/pubspec.yaml
+++ b/packages/wifi_info_flutter/wifi_info_flutter/example/pubspec.yaml
@@ -19,7 +19,7 @@ dependencies:
 
 dev_dependencies:
   integration_test:
-    path: ../../../integration_test
+    sdk: flutter
   flutter_test:
     sdk: flutter
 
diff --git a/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/integration_test/wifi_info_test.dart b/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/integration_test/wifi_info_test.dart
index 6fe4737ae7a1..764167a50f01 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/integration_test/wifi_info_test.dart
+++ b/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/integration_test/wifi_info_test.dart
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// @dart = 2.9
 import 'dart:io';
 import 'package:integration_test/integration_test.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -12,7 +11,7 @@ void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
   group('$WifiInfo test driver', () {
-    WifiInfo _wifiInfo;
+    late WifiInfo _wifiInfo;
 
     setUpAll(() async {
       _wifiInfo = WifiInfo();
diff --git a/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/test/integration_test.dart b/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/test/integration_test.dart
index d59272c77431..8a77ec87bbac 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/test/integration_test.dart
+++ b/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/test/integration_test.dart
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// @dart = 2.9
 import 'dart:convert';
 import 'dart:io';
 import 'package:flutter_driver/flutter_driver.dart';
diff --git a/packages/wifi_info_flutter/wifi_info_flutter/integration_test/wifi_info_test.dart b/packages/wifi_info_flutter/wifi_info_flutter/integration_test/wifi_info_test.dart
deleted file mode 100644
index 4760b88d9019..000000000000
--- a/packages/wifi_info_flutter/wifi_info_flutter/integration_test/wifi_info_test.dart
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2020 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// @dart = 2.9
-
-import 'dart:io';
-import 'package:integration_test/integration_test.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:wifi_info_flutter/wifi_info_flutter.dart';
-
-void main() {
-  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-
-  group('$WifiInfo test driver', () {
-    WifiInfo _wifiInfo;
-
-    setUpAll(() async {
-      _wifiInfo = WifiInfo();
-    });
-
-    testWidgets('test location methods, iOS only', (WidgetTester tester) async {
-      expect(
-        (await _wifiInfo.getLocationServiceAuthorization()),
-        LocationAuthorizationStatus.notDetermined,
-      );
-    }, skip: !Platform.isIOS);
-  });
-}
diff --git a/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml b/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml
index 7b58d481f6c7..ecf26309fad4 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml
+++ b/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml
@@ -13,8 +13,6 @@ dependencies:
   wifi_info_flutter_platform_interface: ^2.0.0
 
 dev_dependencies:
-  integration_test:
-    path: ../../integration_test
   flutter_test:
     sdk: flutter
 

From eb308c497de01e96f570b3113cb6d9f9bed0b08e Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Fri, 26 Feb 2021 16:23:00 -0800
Subject: [PATCH 9/9] remove unnecessary integration test folder

---
 .../integration_test/connectivity_test.dart   | 27 -------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 packages/connectivity/connectivity/integration_test/connectivity_test.dart

diff --git a/packages/connectivity/connectivity/integration_test/connectivity_test.dart b/packages/connectivity/connectivity/integration_test/connectivity_test.dart
deleted file mode 100644
index 3177b66ea48a..000000000000
--- a/packages/connectivity/connectivity/integration_test/connectivity_test.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// TODO(cyanglaz): Remove once https://github.com/flutter/plugins/pull/3158 is landed.
-// @dart = 2.9
-
-import 'package:integration_test/integration_test.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:connectivity/connectivity.dart';
-
-void main() {
-  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-
-  group('Connectivity test driver', () {
-    Connectivity _connectivity;
-
-    setUpAll(() async {
-      _connectivity = Connectivity();
-    });
-
-    testWidgets('test connectivity result', (WidgetTester tester) async {
-      final ConnectivityResult result = await _connectivity.checkConnectivity();
-      expect(result, isNotNull);
-    });
-  });
-}