From 18e6d22a62b2fba9e10740996ec3bb930206edac Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Thu, 8 Jul 2021 11:49:04 -0700
Subject: [PATCH 01/21] lets see if integration tests run

---
 .../EmbeddingV1ActivityTest.java               | 18 ------------------
 .../MainActivityTest.java                      |  9 +++++++++
 2 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1ActivityTest.java

diff --git a/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1ActivityTest.java b/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1ActivityTest.java
deleted file mode 100644
index 56691d2fc82a..000000000000
--- a/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1ActivityTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package io.flutter.plugins.webviewflutterexample;
-
-import androidx.test.rule.ActivityTestRule;
-import dev.flutter.plugins.integration_test.FlutterTestRunner;
-import org.junit.Rule;
-import org.junit.runner.RunWith;
-
-@RunWith(FlutterTestRunner.class)
-@SuppressWarnings("deprecation")
-public class EmbeddingV1ActivityTest {
-  @Rule
-  public ActivityTestRule<EmbeddingV1Activity> rule =
-      new ActivityTestRule<>(EmbeddingV1Activity.class);
-}
diff --git a/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java b/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
index b18308ab2feb..91c222eec903 100644
--- a/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
+++ b/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
@@ -4,14 +4,23 @@
 
 package io.flutter.plugins.webviewflutterexample;
 
+import static org.junit.Assert.assertEquals;
+
 import androidx.test.rule.ActivityTestRule;
 import dev.flutter.plugins.integration_test.FlutterTestRunner;
 import io.flutter.embedding.android.FlutterActivity;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
 
+import org.junit.Test;
+
 @RunWith(FlutterTestRunner.class)
 public class MainActivityTest {
   @Rule
   public ActivityTestRule<FlutterActivity> rule = new ActivityTestRule<>(FlutterActivity.class);
+
+  @Test
+  void testSomething() {
+    assertEquals(1, 2);
+  }
 }

From 2025b844a1afe71486f5f0c4fe69a03ea25bc697 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Mon, 12 Jul 2021 15:55:53 -0700
Subject: [PATCH 02/21] change folder name

---
 .../flutter/plugins/webviewflutterexample/MainActivityTest.java   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename packages/webview_flutter/example/android/app/src/{androidTestDebug => androidTest}/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java (100%)

diff --git a/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
similarity index 100%
rename from packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
rename to packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java

From ddf5d91de92039a9e9206eb7e7cb57feed260be9 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Tue, 13 Jul 2021 15:05:05 -0700
Subject: [PATCH 03/21] create a running test with ./gradlew
 app:connectedAndroidTest
 -Ptarget=/Users/bmparr/Development/plugins/../test_driver/webview_flutter_test.dart

---
 .../example/android/app/build.gradle          |  7 ++--
 .../MainActivityTest.java                     | 33 +++++++++++++------
 .../android/app/src/main/AndroidManifest.xml  |  1 +
 .../webview_flutter/example/lib/main.dart     |  1 +
 packages/webview_flutter/example/pubspec.yaml |  1 +
 .../test_driver/webview_flutter_test.dart     |  7 ++++
 6 files changed, 37 insertions(+), 13 deletions(-)
 create mode 100644 packages/webview_flutter/example/test_driver/webview_flutter_test.dart

diff --git a/packages/webview_flutter/example/android/app/build.gradle b/packages/webview_flutter/example/android/app/build.gradle
index 47eb97623747..0b7884350182 100644
--- a/packages/webview_flutter/example/android/app/build.gradle
+++ b/packages/webview_flutter/example/android/app/build.gradle
@@ -56,7 +56,8 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test:rules:1.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    testImplementation "com.google.truth:truth:1.0"
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    api 'androidx.test:core:1.2.0'
 }
diff --git a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
index 91c222eec903..d2977a08b520 100644
--- a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
+++ b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
@@ -4,23 +4,36 @@
 
 package io.flutter.plugins.webviewflutterexample;
 
-import static org.junit.Assert.assertEquals;
-
-import androidx.test.rule.ActivityTestRule;
-import dev.flutter.plugins.integration_test.FlutterTestRunner;
+import static androidx.test.espresso.flutter.EspressoFlutter.onFlutterWidget;
+import static androidx.test.espresso.flutter.assertion.FlutterAssertions.matches;
+import static androidx.test.espresso.flutter.matcher.FlutterMatchers.isExisting;
+import static androidx.test.espresso.flutter.matcher.FlutterMatchers.withValueKey;
+import androidx.test.core.app.ActivityScenario;
+import androidx.test.runner.AndroidJUnit4;
 import io.flutter.embedding.android.FlutterActivity;
-import org.junit.Rule;
+
+import org.junit.After;
+import org.junit.Before;
 import org.junit.runner.RunWith;
 
 import org.junit.Test;
 
-@RunWith(FlutterTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 public class MainActivityTest {
-  @Rule
-  public ActivityTestRule<FlutterActivity> rule = new ActivityTestRule<>(FlutterActivity.class);
+  ActivityScenario<FlutterActivity> scenario;
+
+  @Before
+  public void setup() {
+    scenario = ActivityScenario.launch(FlutterActivity.class);
+  }
+
+  @After
+  public void cleanup() {
+    scenario.close();
+  }
 
   @Test
-  void testSomething() {
-    assertEquals(1, 2);
+  public void testWebViewViewIsAddedToTree() {
+    onFlutterWidget(withValueKey("example_webView")).check(matches(isExisting()));
   }
 }
diff --git a/packages/webview_flutter/example/android/app/src/main/AndroidManifest.xml b/packages/webview_flutter/example/android/app/src/main/AndroidManifest.xml
index 02f270fb9c49..fcd2d2137f4d 100644
--- a/packages/webview_flutter/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/webview_flutter/example/android/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
   <application
     android:icon="@mipmap/ic_launcher"
     android:label="webview_flutter_example"
+    android:usesCleartextTraffic="true"
     android:name="io.flutter.app.FlutterApplication">
     <meta-data
         android:name="flutterEmbedding"
diff --git a/packages/webview_flutter/example/lib/main.dart b/packages/webview_flutter/example/lib/main.dart
index 88256cc66287..5ea02a549604 100644
--- a/packages/webview_flutter/example/lib/main.dart
+++ b/packages/webview_flutter/example/lib/main.dart
@@ -57,6 +57,7 @@ class _WebViewExampleState extends State<WebViewExample> {
       // to allow calling Scaffold.of(context) so we can show a snackbar.
       body: Builder(builder: (BuildContext context) {
         return WebView(
+          key: Key('example_webView'),
           initialUrl: 'https://flutter.dev',
           javascriptMode: JavascriptMode.unrestricted,
           onWebViewCreated: (WebViewController webViewController) {
diff --git a/packages/webview_flutter/example/pubspec.yaml b/packages/webview_flutter/example/pubspec.yaml
index 3529ecc069c8..2316d7941427 100644
--- a/packages/webview_flutter/example/pubspec.yaml
+++ b/packages/webview_flutter/example/pubspec.yaml
@@ -17,6 +17,7 @@ dependencies:
     path: ../
 
 dev_dependencies:
+  espresso: ^0.1.0+2
   flutter_test:
     sdk: flutter
   flutter_driver:
diff --git a/packages/webview_flutter/example/test_driver/webview_flutter_test.dart b/packages/webview_flutter/example/test_driver/webview_flutter_test.dart
new file mode 100644
index 000000000000..287c708ab9d8
--- /dev/null
+++ b/packages/webview_flutter/example/test_driver/webview_flutter_test.dart
@@ -0,0 +1,7 @@
+import 'package:flutter_driver/driver_extension.dart';
+import 'package:webview_flutter_example/main.dart' as app;
+
+void main() {
+  enableFlutterDriverExtension();
+  app.main();
+}
\ No newline at end of file

From 562cc4d043b69815d37a6ff9920d49386c8d2e1d Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Tue, 13 Jul 2021 20:30:53 -0700
Subject: [PATCH 04/21] see if tests run on ci?.

---
 .../webviewflutterexample/MainActivityTest.java | 17 ++++++++++++-----
 .../integration_test/webview_flutter_test.dart  |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
index d2977a08b520..e726a8095bbb 100644
--- a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
+++ b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
@@ -9,31 +9,38 @@
 import static androidx.test.espresso.flutter.matcher.FlutterMatchers.isExisting;
 import static androidx.test.espresso.flutter.matcher.FlutterMatchers.withValueKey;
 import androidx.test.core.app.ActivityScenario;
+import androidx.test.rule.ActivityTestRule;
 import androidx.test.runner.AndroidJUnit4;
+
+import dev.flutter.plugins.integration_test.FlutterTestRunner;
 import io.flutter.embedding.android.FlutterActivity;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.runner.RunWith;
 
 import org.junit.Test;
 
-@RunWith(AndroidJUnit4.class)
+@RunWith(FlutterTestRunner.class)
 public class MainActivityTest {
-  ActivityScenario<FlutterActivity> scenario;
+  //ActivityScenario<FlutterActivity> scenario;
+
+  @Rule
+  public final ActivityTestRule<FlutterActivity> rule = new ActivityTestRule<>(FlutterActivity.class);
 
   @Before
   public void setup() {
-    scenario = ActivityScenario.launch(FlutterActivity.class);
+    //scenario = ActivityScenario.launch(FlutterActivity.class);
   }
 
   @After
   public void cleanup() {
-    scenario.close();
+    //scenario.close();
   }
 
   @Test
   public void testWebViewViewIsAddedToTree() {
-    onFlutterWidget(withValueKey("example_webView")).check(matches(isExisting()));
+    //onFlutterWidget(withValueKey("example_webView")).check(matches(isExisting()));
   }
 }
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 4b9fecaee8a1..df9415741405 100644
--- a/packages/webview_flutter/example/integration_test/webview_flutter_test.dart
+++ b/packages/webview_flutter/example/integration_test/webview_flutter_test.dart
@@ -1276,7 +1276,7 @@ void main() {
     await pageLoaded.future;
     final String? currentUrl = await controller.currentUrl();
     expect(currentUrl, 'about:blank');
-  });
+  }, skip: true);
 
   testWidgets(
     'can open new window and go back',

From cad641b54ad6eb05cfe71b91111faa6a8c9a644b Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Fri, 16 Jul 2021 18:30:49 -0700
Subject: [PATCH 05/21] fix a few tests

---
 .../MainActivityTest.java                     | 31 +------------
 .../webviewflutterexample/WebViewTest.java    | 11 +++++
 .../webview_flutter_test.dart                 | 46 ++++++-------------
 .../test_driver/webview_flutter_test.dart     |  7 ---
 4 files changed, 26 insertions(+), 69 deletions(-)
 create mode 100644 packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
 delete mode 100644 packages/webview_flutter/example/test_driver/webview_flutter_test.dart

diff --git a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
index e726a8095bbb..bd1b8cfd40ee 100644
--- a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
+++ b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
@@ -4,43 +4,14 @@
 
 package io.flutter.plugins.webviewflutterexample;
 
-import static androidx.test.espresso.flutter.EspressoFlutter.onFlutterWidget;
-import static androidx.test.espresso.flutter.assertion.FlutterAssertions.matches;
-import static androidx.test.espresso.flutter.matcher.FlutterMatchers.isExisting;
-import static androidx.test.espresso.flutter.matcher.FlutterMatchers.withValueKey;
-import androidx.test.core.app.ActivityScenario;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
-
 import dev.flutter.plugins.integration_test.FlutterTestRunner;
 import io.flutter.embedding.android.FlutterActivity;
-
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
 
-import org.junit.Test;
-
-@RunWith(FlutterTestRunner.class)
+//@RunWith(FlutterTestRunner.class)
 public class MainActivityTest {
-  //ActivityScenario<FlutterActivity> scenario;
-
   @Rule
   public final ActivityTestRule<FlutterActivity> rule = new ActivityTestRule<>(FlutterActivity.class);
-
-  @Before
-  public void setup() {
-    //scenario = ActivityScenario.launch(FlutterActivity.class);
-  }
-
-  @After
-  public void cleanup() {
-    //scenario.close();
-  }
-
-  @Test
-  public void testWebViewViewIsAddedToTree() {
-    //onFlutterWidget(withValueKey("example_webView")).check(matches(isExisting()));
-  }
 }
diff --git a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
new file mode 100644
index 000000000000..14235ded6767
--- /dev/null
+++ b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
@@ -0,0 +1,11 @@
+package io.flutter.plugins.webviewflutterexample;
+
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
+public class WebViewTest {
+  @Test
+  public void placeHolderTest() {
+    assertEquals(1, 2);
+  }
+}
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 df9415741405..23fec2979aee 100644
--- a/packages/webview_flutter/example/integration_test/webview_flutter_test.dart
+++ b/packages/webview_flutter/example/integration_test/webview_flutter_test.dart
@@ -18,7 +18,7 @@ import 'package:integration_test/integration_test.dart';
 void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
-  testWidgets('initalUrl', (WidgetTester tester) async {
+  testWidgets('initialUrl', (WidgetTester tester) async {
     final Completer<WebViewController> controllerCompleter =
         Completer<WebViewController>();
     await tester.pumpWidget(
@@ -532,6 +532,7 @@ void main() {
       expect(fullScreen, _webviewBool(false));
     });
 
+    // allowsInlineMediaPlayback is a noop on Android, so it is skipped.
     testWidgets(
         'Video plays full screen when allowsInlineMediaPlayback is false',
         (WidgetTester tester) async {
@@ -581,7 +582,7 @@ void main() {
       String fullScreen =
           await controller.evaluateJavascript('isFullScreen();');
       expect(fullScreen, _webviewBool(true));
-    });
+    }, skip: Platform.isAndroid);
   });
 
   group('Audio playback policy', () {
@@ -1251,39 +1252,12 @@ void main() {
     expect(currentUrl, 'https://flutter.dev/');
   });
 
-  testWidgets('target _blank opens in same window',
-      (WidgetTester tester) async {
-    final Completer<WebViewController> controllerCompleter =
-        Completer<WebViewController>();
-    final Completer<void> pageLoaded = Completer<void>();
-    await tester.pumpWidget(
-      Directionality(
-        textDirection: TextDirection.ltr,
-        child: WebView(
-          key: GlobalKey(),
-          onWebViewCreated: (WebViewController controller) {
-            controllerCompleter.complete(controller);
-          },
-          javascriptMode: JavascriptMode.unrestricted,
-          onPageFinished: (String url) {
-            pageLoaded.complete(null);
-          },
-        ),
-      ),
-    );
-    final WebViewController controller = await controllerCompleter.future;
-    await controller.evaluateJavascript('window.open("about:blank", "_blank")');
-    await pageLoaded.future;
-    final String? currentUrl = await controller.currentUrl();
-    expect(currentUrl, 'about:blank');
-  }, skip: true);
-
   testWidgets(
     'can open new window and go back',
     (WidgetTester tester) async {
       final Completer<WebViewController> controllerCompleter =
           Completer<WebViewController>();
-      final Completer<void> pageLoaded = Completer<void>();
+      Completer<void> pageLoaded = Completer<void>();
       await tester.pumpWidget(
         Directionality(
           textDirection: TextDirection.ltr,
@@ -1297,17 +1271,25 @@ void main() {
               pageLoaded.complete();
             },
             initialUrl: 'https://flutter.dev',
+            navigationDelegate: (_) => NavigationDecision.navigate,
           ),
         ),
       );
       final WebViewController controller = await controllerCompleter.future;
+      expect(controller.currentUrl(), completion('https://flutter.dev/'));
+      await pageLoaded.future;
+      pageLoaded = Completer<void>();
+
       await controller
-          .evaluateJavascript('window.open("https://www.google.com")');
+          .evaluateJavascript('window.open("https://www.google.com/")');
       await pageLoaded.future;
+      pageLoaded = Completer<void>();
       expect(controller.currentUrl(), completion('https://www.google.com/'));
 
+      expect(controller.canGoBack(), completion(true));
       await controller.goBack();
-      expect(controller.currentUrl(), completion('https://www.flutter.dev'));
+      await pageLoaded.future;
+      expect(controller.currentUrl(), completion('https://flutter.dev/'));
     },
     skip: !Platform.isAndroid,
   );
diff --git a/packages/webview_flutter/example/test_driver/webview_flutter_test.dart b/packages/webview_flutter/example/test_driver/webview_flutter_test.dart
deleted file mode 100644
index 287c708ab9d8..000000000000
--- a/packages/webview_flutter/example/test_driver/webview_flutter_test.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-import 'package:flutter_driver/driver_extension.dart';
-import 'package:webview_flutter_example/main.dart' as app;
-
-void main() {
-  enableFlutterDriverExtension();
-  app.main();
-}
\ No newline at end of file

From b94cfbbc9e10e1ab8933353a2e2a5a4e98774ed2 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Fri, 16 Jul 2021 18:44:59 -0700
Subject: [PATCH 06/21] try get all tests passing

---
 .../webview_flutter_test.dart                 | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 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 23fec2979aee..b114b5c57355 100644
--- a/packages/webview_flutter/example/integration_test/webview_flutter_test.dart
+++ b/packages/webview_flutter/example/integration_test/webview_flutter_test.dart
@@ -18,25 +18,28 @@ import 'package:integration_test/integration_test.dart';
 void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
-  testWidgets('initialUrl', (WidgetTester tester) async {
-    final Completer<WebViewController> controllerCompleter =
-        Completer<WebViewController>();
-    await tester.pumpWidget(
-      Directionality(
-        textDirection: TextDirection.ltr,
-        child: WebView(
-          key: GlobalKey(),
-          initialUrl: 'https://flutter.dev/',
-          onWebViewCreated: (WebViewController controller) {
-            controllerCompleter.complete(controller);
-          },
+  testWidgets(
+    'initialUrl',
+    (WidgetTester tester) async {
+      final Completer<WebViewController> controllerCompleter =
+          Completer<WebViewController>();
+      await tester.pumpWidget(
+        Directionality(
+          textDirection: TextDirection.ltr,
+          child: WebView(
+            key: GlobalKey(),
+            initialUrl: 'https://flutter.dev/',
+            onWebViewCreated: (WebViewController controller) {
+              controllerCompleter.complete(controller);
+            },
+          ),
         ),
-      ),
-    );
-    final WebViewController controller = await controllerCompleter.future;
-    final String? currentUrl = await controller.currentUrl();
-    expect(currentUrl, 'https://flutter.dev/');
-  });
+      );
+      final WebViewController controller = await controllerCompleter.future;
+      final String? currentUrl = await controller.currentUrl();
+      expect(currentUrl, 'https://flutter.dev/');
+    },
+  );
 
   testWidgets('loadUrl', (WidgetTester tester) async {
     final Completer<WebViewController> controllerCompleter =

From 744c395c3a25abe55c19e6df1c8bb33d590e63b0 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Sat, 17 Jul 2021 17:16:03 -0700
Subject: [PATCH 07/21] fluttertestrunner and placeholder test

---
 .../flutter/plugins/webviewflutterexample/MainActivityTest.java | 2 +-
 .../io/flutter/plugins/webviewflutterexample/WebViewTest.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
index bd1b8cfd40ee..c54e4c0d2cd0 100644
--- a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
+++ b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
@@ -10,7 +10,7 @@
 import org.junit.Rule;
 import org.junit.runner.RunWith;
 
-//@RunWith(FlutterTestRunner.class)
+@RunWith(FlutterTestRunner.class)
 public class MainActivityTest {
   @Rule
   public final ActivityTestRule<FlutterActivity> rule = new ActivityTestRule<>(FlutterActivity.class);
diff --git a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
index 14235ded6767..3db04fc97892 100644
--- a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
+++ b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
@@ -6,6 +6,6 @@
 public class WebViewTest {
   @Test
   public void placeHolderTest() {
-    assertEquals(1, 2);
+    assertEquals(1, 1);
   }
 }

From 6d9f28200969fa48b12a1deedd80b5e1c92f345f Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Sat, 17 Jul 2021 17:22:24 -0700
Subject: [PATCH 08/21] formatting

---
 .../plugins/webviewflutterexample/MainActivityTest.java        | 3 ++-
 .../io/flutter/plugins/webviewflutterexample/WebViewTest.java  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
index c54e4c0d2cd0..5dd7be91512c 100644
--- a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
+++ b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
@@ -13,5 +13,6 @@
 @RunWith(FlutterTestRunner.class)
 public class MainActivityTest {
   @Rule
-  public final ActivityTestRule<FlutterActivity> rule = new ActivityTestRule<>(FlutterActivity.class);
+  public final ActivityTestRule<FlutterActivity> rule =
+      new ActivityTestRule<>(FlutterActivity.class);
 }
diff --git a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
index 3db04fc97892..f3e894e8c2bb 100644
--- a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
+++ b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
@@ -1,8 +1,9 @@
 package io.flutter.plugins.webviewflutterexample;
 
-import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 
+import org.junit.Test;
+
 public class WebViewTest {
   @Test
   public void placeHolderTest() {

From e5ea80c3d1380a28050767980d8c9e528b355e97 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Sat, 17 Jul 2021 19:11:13 -0700
Subject: [PATCH 09/21] fix blank test, formatting, license

---
 .../webviewflutterexample/WebViewTest.java    |  4 +++
 .../webview_flutter_test.dart                 | 28 +++++++++++++++++++
 .../webview_flutter/example/lib/main.dart     |  1 -
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
index f3e894e8c2bb..05753687c954 100644
--- a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
+++ b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
@@ -1,3 +1,7 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 package io.flutter.plugins.webviewflutterexample;
 
 import static org.junit.Assert.assertEquals;
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 b114b5c57355..8f5359f1a096 100644
--- a/packages/webview_flutter/example/integration_test/webview_flutter_test.dart
+++ b/packages/webview_flutter/example/integration_test/webview_flutter_test.dart
@@ -1255,6 +1255,34 @@ void main() {
     expect(currentUrl, 'https://flutter.dev/');
   });
 
+  testWidgets('target _blank opens in same window',
+      (WidgetTester tester) async {
+    final Completer<WebViewController> controllerCompleter =
+        Completer<WebViewController>();
+    final Completer<void> pageLoaded = Completer<void>();
+    await tester.pumpWidget(
+      Directionality(
+        textDirection: TextDirection.ltr,
+        child: WebView(
+          key: GlobalKey(),
+          onWebViewCreated: (WebViewController controller) {
+            controllerCompleter.complete(controller);
+          },
+          javascriptMode: JavascriptMode.unrestricted,
+          onPageFinished: (String url) {
+            pageLoaded.complete(null);
+          },
+        ),
+      ),
+    );
+    final WebViewController controller = await controllerCompleter.future;
+    await controller
+        .evaluateJavascript('window.open("https://flutter.dev/", "_blank")');
+    await pageLoaded.future;
+    final String? currentUrl = await controller.currentUrl();
+    expect(currentUrl, 'https://flutter.dev/');
+  });
+
   testWidgets(
     'can open new window and go back',
     (WidgetTester tester) async {
diff --git a/packages/webview_flutter/example/lib/main.dart b/packages/webview_flutter/example/lib/main.dart
index 5ea02a549604..88256cc66287 100644
--- a/packages/webview_flutter/example/lib/main.dart
+++ b/packages/webview_flutter/example/lib/main.dart
@@ -57,7 +57,6 @@ class _WebViewExampleState extends State<WebViewExample> {
       // to allow calling Scaffold.of(context) so we can show a snackbar.
       body: Builder(builder: (BuildContext context) {
         return WebView(
-          key: Key('example_webView'),
           initialUrl: 'https://flutter.dev',
           javascriptMode: JavascriptMode.unrestricted,
           onWebViewCreated: (WebViewController webViewController) {

From 2489c44fac5b0b44d82aa3eca4595c7d7d33c1e6 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Sat, 17 Jul 2021 19:26:38 -0700
Subject: [PATCH 10/21] undo formatting change and remove navigation delegate

---
 .../webview_flutter_test.dart                 | 40 +++++++++----------
 1 file changed, 18 insertions(+), 22 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 8f5359f1a096..18c279f1a84b 100644
--- a/packages/webview_flutter/example/integration_test/webview_flutter_test.dart
+++ b/packages/webview_flutter/example/integration_test/webview_flutter_test.dart
@@ -18,28 +18,25 @@ import 'package:integration_test/integration_test.dart';
 void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
-  testWidgets(
-    'initialUrl',
-    (WidgetTester tester) async {
-      final Completer<WebViewController> controllerCompleter =
-          Completer<WebViewController>();
-      await tester.pumpWidget(
-        Directionality(
-          textDirection: TextDirection.ltr,
-          child: WebView(
-            key: GlobalKey(),
-            initialUrl: 'https://flutter.dev/',
-            onWebViewCreated: (WebViewController controller) {
-              controllerCompleter.complete(controller);
-            },
-          ),
+  testWidgets('initialUrl', (WidgetTester tester) async {
+    final Completer<WebViewController> controllerCompleter =
+        Completer<WebViewController>();
+    await tester.pumpWidget(
+      Directionality(
+        textDirection: TextDirection.ltr,
+        child: WebView(
+          key: GlobalKey(),
+          initialUrl: 'https://flutter.dev/',
+          onWebViewCreated: (WebViewController controller) {
+            controllerCompleter.complete(controller);
+          },
         ),
-      );
-      final WebViewController controller = await controllerCompleter.future;
-      final String? currentUrl = await controller.currentUrl();
-      expect(currentUrl, 'https://flutter.dev/');
-    },
-  );
+      ),
+    );
+    final WebViewController controller = await controllerCompleter.future;
+    final String? currentUrl = await controller.currentUrl();
+    expect(currentUrl, 'https://flutter.dev/');
+  });
 
   testWidgets('loadUrl', (WidgetTester tester) async {
     final Completer<WebViewController> controllerCompleter =
@@ -1302,7 +1299,6 @@ void main() {
               pageLoaded.complete();
             },
             initialUrl: 'https://flutter.dev',
-            navigationDelegate: (_) => NavigationDecision.navigate,
           ),
         ),
       );

From 76d612e3c398c2ec72e6c2306cc58024fa53373a Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Mon, 19 Jul 2021 10:59:02 -0700
Subject: [PATCH 11/21] Improve example test and version bump test dependencies

---
 .../example/android/app/build.gradle          |  4 ++--
 .../webviewflutterexample/WebViewTest.java    | 11 +++++++++-
 .../WebViewTestActivity.java                  | 16 ++++++++++++++
 .../android/app/src/debug/AndroidManifest.xml | 21 +++++++++++++++++++
 .../android/app/src/main/AndroidManifest.xml  |  1 -
 5 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTestActivity.java
 create mode 100644 packages/webview_flutter/example/android/app/src/debug/AndroidManifest.xml

diff --git a/packages/webview_flutter/example/android/app/build.gradle b/packages/webview_flutter/example/android/app/build.gradle
index 0b7884350182..edd50ec67d67 100644
--- a/packages/webview_flutter/example/android/app/build.gradle
+++ b/packages/webview_flutter/example/android/app/build.gradle
@@ -57,7 +57,7 @@ flutter {
 dependencies {
     testImplementation 'junit:junit:4.12'
     testImplementation "com.google.truth:truth:1.0"
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     api 'androidx.test:core:1.2.0'
 }
diff --git a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
index 05753687c954..e7219446540e 100644
--- a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
+++ b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
@@ -5,12 +5,21 @@
 package io.flutter.plugins.webviewflutterexample;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
+import androidx.test.core.app.ActivityScenario;
+import io.flutter.plugins.webviewflutter.WebViewFlutterPlugin;
 import org.junit.Test;
 
 public class WebViewTest {
   @Test
-  public void placeHolderTest() {
+  public void webViewPluginIsAdded() {
+    final ActivityScenario<WebViewTestActivity> scenario =
+        ActivityScenario.launch(WebViewTestActivity.class);
+    scenario.onActivity(
+        activity -> {
+          assertTrue(activity.engine.getPlugins().has(WebViewFlutterPlugin.class));
+        });
     assertEquals(1, 1);
   }
 }
diff --git a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTestActivity.java b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTestActivity.java
new file mode 100644
index 000000000000..58d2e0a408e8
--- /dev/null
+++ b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTestActivity.java
@@ -0,0 +1,16 @@
+package io.flutter.plugins.webviewflutterexample;
+
+import androidx.annotation.NonNull;
+import io.flutter.embedding.android.FlutterActivity;
+import io.flutter.embedding.engine.FlutterEngine;
+
+// Extends FlutterActivity to make the FlutterEngine accessible for testing.
+public class WebViewTestActivity extends FlutterActivity {
+  public FlutterEngine engine;
+
+  @Override
+  public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
+    super.configureFlutterEngine(flutterEngine);
+    engine = flutterEngine;
+  }
+}
diff --git a/packages/webview_flutter/example/android/app/src/debug/AndroidManifest.xml b/packages/webview_flutter/example/android/app/src/debug/AndroidManifest.xml
new file mode 100644
index 000000000000..65f02cc6bab4
--- /dev/null
+++ b/packages/webview_flutter/example/android/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="io.flutter.plugins.webviewflutterexample">
+    <!-- Flutter needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <application android:usesCleartextTraffic="true">
+        <activity
+            android:name=".WebViewTestActivity"
+            android:launchMode="singleTop"
+            android:theme="@style/LaunchTheme"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
+            android:windowSoftInputMode="adjustResize">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/packages/webview_flutter/example/android/app/src/main/AndroidManifest.xml b/packages/webview_flutter/example/android/app/src/main/AndroidManifest.xml
index fcd2d2137f4d..02f270fb9c49 100644
--- a/packages/webview_flutter/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/webview_flutter/example/android/app/src/main/AndroidManifest.xml
@@ -9,7 +9,6 @@
   <application
     android:icon="@mipmap/ic_launcher"
     android:label="webview_flutter_example"
-    android:usesCleartextTraffic="true"
     android:name="io.flutter.app.FlutterApplication">
     <meta-data
         android:name="flutterEmbedding"

From dc6be9af9912ddc116cc3f36e45e94fb6c0c846c Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Mon, 19 Jul 2021 10:59:32 -0700
Subject: [PATCH 12/21] remove assertequals

---
 .../io/flutter/plugins/webviewflutterexample/WebViewTest.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
index e7219446540e..d9dd9fe202aa 100644
--- a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
+++ b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
@@ -20,6 +20,5 @@ public void webViewPluginIsAdded() {
         activity -> {
           assertTrue(activity.engine.getPlugins().has(WebViewFlutterPlugin.class));
         });
-    assertEquals(1, 1);
   }
 }

From 8713690f40e4cc0fe47a7547e3f85adacf9e0354 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Mon, 19 Jul 2021 11:01:56 -0700
Subject: [PATCH 13/21] small format changes

---
 .../plugins/webviewflutterexample/MainActivityTest.java        | 3 +--
 .../io/flutter/plugins/webviewflutterexample/WebViewTest.java  | 1 -
 .../example/android/app/src/debug/AndroidManifest.xml          | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
index 5dd7be91512c..b18308ab2feb 100644
--- a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
+++ b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java
@@ -13,6 +13,5 @@
 @RunWith(FlutterTestRunner.class)
 public class MainActivityTest {
   @Rule
-  public final ActivityTestRule<FlutterActivity> rule =
-      new ActivityTestRule<>(FlutterActivity.class);
+  public ActivityTestRule<FlutterActivity> rule = new ActivityTestRule<>(FlutterActivity.class);
 }
diff --git a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
index d9dd9fe202aa..0b3eeef9b6b7 100644
--- a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
+++ b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
@@ -4,7 +4,6 @@
 
 package io.flutter.plugins.webviewflutterexample;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import androidx.test.core.app.ActivityScenario;
diff --git a/packages/webview_flutter/example/android/app/src/debug/AndroidManifest.xml b/packages/webview_flutter/example/android/app/src/debug/AndroidManifest.xml
index 65f02cc6bab4..2a9746fca1aa 100644
--- a/packages/webview_flutter/example/android/app/src/debug/AndroidManifest.xml
+++ b/packages/webview_flutter/example/android/app/src/debug/AndroidManifest.xml
@@ -18,4 +18,4 @@
             </intent-filter>
         </activity>
     </application>
-</manifest>
\ No newline at end of file
+</manifest>

From 648e94c5d694575b382a0e62ecb1ae4a3a180685 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Mon, 19 Jul 2021 12:40:23 -0700
Subject: [PATCH 14/21] license

---
 .../plugins/webviewflutterexample/WebViewTestActivity.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTestActivity.java b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTestActivity.java
index 58d2e0a408e8..cb53a7a0dbf5 100644
--- a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTestActivity.java
+++ b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTestActivity.java
@@ -1,3 +1,7 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 package io.flutter.plugins.webviewflutterexample;
 
 import androidx.annotation.NonNull;

From 36197628a18ff63233e9b1f4f636f922ddaf773b Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Mon, 19 Jul 2021 14:14:39 -0700
Subject: [PATCH 15/21] remove truth dependency, change core dep and follow
 example

---
 .../example/android/app/build.gradle                |  3 +--
 .../plugins/webviewflutterexample/WebViewTest.java  | 13 +++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/webview_flutter/example/android/app/build.gradle b/packages/webview_flutter/example/android/app/build.gradle
index edd50ec67d67..56f01ba8e575 100644
--- a/packages/webview_flutter/example/android/app/build.gradle
+++ b/packages/webview_flutter/example/android/app/build.gradle
@@ -56,8 +56,7 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    testImplementation "com.google.truth:truth:1.0"
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    api 'androidx.test:core:1.2.0'
+    androidTestImplementation 'androidx.test:core:1.2.0'
 }
diff --git a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
index 0b3eeef9b6b7..5cdb9e663730 100644
--- a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
+++ b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
@@ -13,11 +13,12 @@
 public class WebViewTest {
   @Test
   public void webViewPluginIsAdded() {
-    final ActivityScenario<WebViewTestActivity> scenario =
-        ActivityScenario.launch(WebViewTestActivity.class);
-    scenario.onActivity(
-        activity -> {
-          assertTrue(activity.engine.getPlugins().has(WebViewFlutterPlugin.class));
-        });
+    try (ActivityScenario<WebViewTestActivity> scenario =
+        ActivityScenario.launch(WebViewTestActivity.class)) {
+      scenario.onActivity(
+          activity -> {
+            assertTrue(activity.engine.getPlugins().has(WebViewFlutterPlugin.class));
+          });
+    }
   }
 }

From ffe0058a55e32148b32f7c8d68923597dfb8f6ae Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Mon, 19 Jul 2021 14:22:05 -0700
Subject: [PATCH 16/21] undo the test change

---
 .../example/android/app/build.gradle                |  2 +-
 .../plugins/webviewflutterexample/WebViewTest.java  | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/webview_flutter/example/android/app/build.gradle b/packages/webview_flutter/example/android/app/build.gradle
index 56f01ba8e575..9a43699afb2b 100644
--- a/packages/webview_flutter/example/android/app/build.gradle
+++ b/packages/webview_flutter/example/android/app/build.gradle
@@ -58,5 +58,5 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    androidTestImplementation 'androidx.test:core:1.2.0'
+    api 'androidx.test:core:1.2.0'
 }
diff --git a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
index 5cdb9e663730..0b3eeef9b6b7 100644
--- a/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
+++ b/packages/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTest.java
@@ -13,12 +13,11 @@
 public class WebViewTest {
   @Test
   public void webViewPluginIsAdded() {
-    try (ActivityScenario<WebViewTestActivity> scenario =
-        ActivityScenario.launch(WebViewTestActivity.class)) {
-      scenario.onActivity(
-          activity -> {
-            assertTrue(activity.engine.getPlugins().has(WebViewFlutterPlugin.class));
-          });
-    }
+    final ActivityScenario<WebViewTestActivity> scenario =
+        ActivityScenario.launch(WebViewTestActivity.class);
+    scenario.onActivity(
+        activity -> {
+          assertTrue(activity.engine.getPlugins().has(WebViewFlutterPlugin.class));
+        });
   }
 }

From a10bfde2bd694a72258f35853db24a40cedc84c8 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Tue, 20 Jul 2021 11:53:26 -0700
Subject: [PATCH 17/21] readd analysisoptions

---
 packages/webview_flutter/analysis_options.yaml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 packages/webview_flutter/analysis_options.yaml

diff --git a/packages/webview_flutter/analysis_options.yaml b/packages/webview_flutter/analysis_options.yaml
new file mode 100644
index 000000000000..009edf3b33fd
--- /dev/null
+++ b/packages/webview_flutter/analysis_options.yaml
@@ -0,0 +1,2 @@
+@@ -1 +0,0 @@
+include: ../../analysis_options_legacy.yaml

From 42b72388ce75d4f017b6a8091842f1ae837b3e68 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Tue, 20 Jul 2021 11:54:13 -0700
Subject: [PATCH 18/21] remove top line

---
 packages/webview_flutter/analysis_options.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/webview_flutter/analysis_options.yaml b/packages/webview_flutter/analysis_options.yaml
index 009edf3b33fd..cda4f6e153e6 100644
--- a/packages/webview_flutter/analysis_options.yaml
+++ b/packages/webview_flutter/analysis_options.yaml
@@ -1,2 +1 @@
-@@ -1 +0,0 @@
 include: ../../analysis_options_legacy.yaml

From 927b9fefc5957569fac8cedd7dba1a52e12c11f4 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Tue, 20 Jul 2021 14:01:58 -0700
Subject: [PATCH 19/21] empty commit to check for flakes


From 089fa76756d4522accadc1d6c717100329d4c684 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Thu, 22 Jul 2021 10:54:37 -0700
Subject: [PATCH 20/21] skip tests

---
 .../android/app/src/debug/AndroidManifest.xml |  4 ----
 .../android/app/src/main/AndroidManifest.xml  |  2 +-
 .../WebViewTestActivity.java                  |  0
 .../webview_flutter_test.dart                 | 24 ++++++++++++-------
 4 files changed, 17 insertions(+), 13 deletions(-)
 rename packages/webview_flutter/webview_flutter/example/android/app/src/{androidTest => main}/java/io/flutter/plugins/webviewflutterexample/WebViewTestActivity.java (100%)

diff --git a/packages/webview_flutter/webview_flutter/example/android/app/src/debug/AndroidManifest.xml b/packages/webview_flutter/webview_flutter/example/android/app/src/debug/AndroidManifest.xml
index 2a9746fca1aa..28792201bc36 100644
--- a/packages/webview_flutter/webview_flutter/example/android/app/src/debug/AndroidManifest.xml
+++ b/packages/webview_flutter/webview_flutter/example/android/app/src/debug/AndroidManifest.xml
@@ -12,10 +12,6 @@
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
         </activity>
     </application>
 </manifest>
diff --git a/packages/webview_flutter/webview_flutter/example/android/app/src/main/AndroidManifest.xml b/packages/webview_flutter/webview_flutter/example/android/app/src/main/AndroidManifest.xml
index 02f270fb9c49..9b458c944946 100644
--- a/packages/webview_flutter/webview_flutter/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/webview_flutter/webview_flutter/example/android/app/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
        In most cases you can leave this as-is, but you if you want to provide
        additional functionality it is fine to subclass or reimplement
        FlutterApplication and put your custom class here. -->
-  <application
+  <application android:usesCleartextTraffic="true"
     android:icon="@mipmap/ic_launcher"
     android:label="webview_flutter_example"
     android:name="io.flutter.app.FlutterApplication">
diff --git a/packages/webview_flutter/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTestActivity.java b/packages/webview_flutter/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/WebViewTestActivity.java
similarity index 100%
rename from packages/webview_flutter/webview_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/webviewflutterexample/WebViewTestActivity.java
rename to packages/webview_flutter/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/WebViewTestActivity.java
diff --git a/packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test.dart b/packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test.dart
index 18c279f1a84b..6005cb0a8ba6 100644
--- a/packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test.dart
+++ b/packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test.dart
@@ -18,6 +18,7 @@ import 'package:integration_test/integration_test.dart';
 void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
+  // TODO(bparrishMines): skipped due to https://github.com/flutter/flutter/issues/86757.
   testWidgets('initialUrl', (WidgetTester tester) async {
     final Completer<WebViewController> controllerCompleter =
         Completer<WebViewController>();
@@ -36,8 +37,9 @@ void main() {
     final WebViewController controller = await controllerCompleter.future;
     final String? currentUrl = await controller.currentUrl();
     expect(currentUrl, 'https://flutter.dev/');
-  });
+  }, skip: true);
 
+  // TODO(bparrishMines): skipped due to https://github.com/flutter/flutter/issues/86757.
   testWidgets('loadUrl', (WidgetTester tester) async {
     final Completer<WebViewController> controllerCompleter =
         Completer<WebViewController>();
@@ -57,8 +59,9 @@ void main() {
     await controller.loadUrl('https://www.google.com/');
     final String? currentUrl = await controller.currentUrl();
     expect(currentUrl, 'https://www.google.com/');
-  });
+  }, skip: true);
 
+  // TODO(bparrishMines): skipped due to https://github.com/flutter/flutter/issues/86757.
   testWidgets('loadUrl with headers', (WidgetTester tester) async {
     final Completer<WebViewController> controllerCompleter =
         Completer<WebViewController>();
@@ -98,7 +101,7 @@ void main() {
     final String content = await controller
         .evaluateJavascript('document.documentElement.innerText');
     expect(content.contains('flutter_test_header'), isTrue);
-  });
+  }, skip: Platform.isAndroid);
 
   testWidgets('JavaScriptChannel', (WidgetTester tester) async {
     final Completer<WebViewController> controllerCompleter =
@@ -274,6 +277,7 @@ void main() {
     expect(customUserAgent2, 'Custom_User_Agent2');
   });
 
+  // TODO(bparrishMines): skipped due to https://github.com/flutter/flutter/issues/86757.
   testWidgets('use default platform userAgent after webView is rebuilt',
       (WidgetTester tester) async {
     final Completer<WebViewController> controllerCompleter =
@@ -323,7 +327,7 @@ void main() {
 
     final String customUserAgent2 = await _getUserAgent(controller);
     expect(customUserAgent2, defaultPlatformUserAgent);
-  });
+  }, skip: Platform.isAndroid);
 
   group('Video playback policy', () {
     late String videoTestBase64;
@@ -797,6 +801,7 @@ void main() {
   });
 
   group('Programmatic Scroll', () {
+    // TODO(bparrishMines): skipped due to https://github.com/flutter/flutter/issues/86757.
     testWidgets('setAndGetScrollPosition', (WidgetTester tester) async {
       final String scrollTestPage = '''
         <!DOCTYPE html>
@@ -871,7 +876,7 @@ void main() {
       scrollPosY = await controller.getScrollY();
       expect(scrollPosX, X_SCROLL * 2);
       expect(scrollPosY, Y_SCROLL * 2);
-    });
+    }, skip: Platform.isAndroid);
   });
 
   group('SurfaceAndroidWebView', () {
@@ -883,6 +888,7 @@ void main() {
       WebView.platform = null;
     });
 
+    // TODO(bparrishMines): skipped due to https://github.com/flutter/flutter/issues/86757.
     testWidgets('setAndGetScrollPosition', (WidgetTester tester) async {
       final String scrollTestPage = '''
         <!DOCTYPE html>
@@ -949,8 +955,9 @@ void main() {
       scrollPosY = await controller.getScrollY();
       expect(X_SCROLL * 2, scrollPosX);
       expect(Y_SCROLL * 2, scrollPosY);
-    }, skip: !Platform.isAndroid);
+    }, skip: true);
 
+    // TODO(bparrishMines): skipped due to https://github.com/flutter/flutter/issues/86757.
     testWidgets('inputs are scrolled into view when focused',
         (WidgetTester tester) async {
       final String scrollTestPage = '''
@@ -1054,7 +1061,7 @@ void main() {
           lastInputClientRectRelativeToViewport['right'] <=
               viewportRectRelativeToViewport['right'],
           isTrue);
-    }, skip: !Platform.isAndroid);
+    }, skip: true);
   });
 
   group('NavigationDelegate', () {
@@ -1280,6 +1287,7 @@ void main() {
     expect(currentUrl, 'https://flutter.dev/');
   });
 
+  // TODO(bparrishMines): skipped due to https://github.com/flutter/flutter/issues/86757.
   testWidgets(
     'can open new window and go back',
     (WidgetTester tester) async {
@@ -1318,7 +1326,7 @@ void main() {
       await pageLoaded.future;
       expect(controller.currentUrl(), completion('https://flutter.dev/'));
     },
-    skip: !Platform.isAndroid,
+    skip: true,
   );
 
   testWidgets(

From 7e73bb1c8e56cca59ff44ace662a1322f75f6091 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Thu, 22 Jul 2021 11:00:59 -0700
Subject: [PATCH 21/21] remove webview_flutter

---
 .cirrus.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 96902cfd6d15..8550827e5296 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -152,7 +152,7 @@ task:
         # No integration tests to run:
         #   image_picker/image_picker - Native UI is the critical functionality
         #   espresso - No Dart code, so no integration tests
-        PLUGINS_TO_EXCLUDE_INTEGRATION_TESTS: "camera/camera,google_sign_in/google_sign_in,in_app_purchase/in_app_purchase,in_app_purchase_android,quick_actions,shared_preferences/shared_preferences,url_launcher/url_launcher,video_player/video_player,webview_flutter,android_intent,connectivity/connectivity,device_info/device_info,sensors,share,wifi_info_flutter/wifi_info_flutter,image_picker/image_picker,espresso"
+        PLUGINS_TO_EXCLUDE_INTEGRATION_TESTS: "camera/camera,google_sign_in/google_sign_in,in_app_purchase/in_app_purchase,in_app_purchase_android,quick_actions,shared_preferences/shared_preferences,url_launcher/url_launcher,video_player/video_player,android_intent,connectivity/connectivity,device_info/device_info,sensors,share,wifi_info_flutter/wifi_info_flutter,image_picker/image_picker,espresso"
       build_script:
         # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
         # might include non-ASCII characters which makes Gradle crash.