From 286c73c0eb334b1cebb2819eec97fffb1a3f4046 Mon Sep 17 00:00:00 2001
From: Gray Mackall <34871572+gmackall@users.noreply.github.com>
Date: Wed, 10 Apr 2024 14:58:05 -0700
Subject: [PATCH] Remove additional references to engine v1 android embedding
 (#146523)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/flutter/engine/pull/51229 blocked [the roll](https://github.com/flutter/flutter/pull/146522) and had to be reverted, which is a shame, but on the bright side it made it possible to point the framework at my removal pr, at the point of its merging the first time

This fixes all errors that are fixable in the framework that would have blocked the roll. There are some that aren't fixable here (they need to be fixed in the engine)*, so I'll fix those in the engine but unfortunately I can't pick up another version here to re-test until I try to roll again 😢

*This category is: uses of plugins that in turn have a `registerWith`, that references the v1 embedding. The plan to fix these cases is to leave the interface that that method relies on around for now. See https://github.com/flutter/packages/pull/6494#issuecomment-2046010323 for details
---
 dev/tools/create_api_docs.dart                               | 2 +-
 .../plugins/integration_test/IntegrationTestPlugin.java      | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/dev/tools/create_api_docs.dart b/dev/tools/create_api_docs.dart
index 91a1b8f843..18b2875bab 100644
--- a/dev/tools/create_api_docs.dart
+++ b/dev/tools/create_api_docs.dart
@@ -40,7 +40,7 @@ const Map<String, PlatformDocsSection> kPlatformDocs = <String, PlatformDocsSect
   'android': PlatformDocsSection(
     zipName: 'android-javadoc.zip',
     sectionName: 'Android',
-    checkFile: 'io/flutter/view/FlutterView.html',
+    checkFile: 'io/flutter/embedding/android/FlutterView.html',
     subdir: 'javadoc',
   ),
   'ios': PlatformDocsSection(
diff --git a/packages/integration_test/android/src/main/java/dev/flutter/plugins/integration_test/IntegrationTestPlugin.java b/packages/integration_test/android/src/main/java/dev/flutter/plugins/integration_test/IntegrationTestPlugin.java
index 7a230f0ead..56eabbfa6d 100644
--- a/packages/integration_test/android/src/main/java/dev/flutter/plugins/integration_test/IntegrationTestPlugin.java
+++ b/packages/integration_test/android/src/main/java/dev/flutter/plugins/integration_test/IntegrationTestPlugin.java
@@ -30,11 +30,6 @@ public class IntegrationTestPlugin implements MethodCallHandler, FlutterPlugin,
   public static final Future<Map<String, String>> testResults = testResultsSettable;
 
   /** Plugin registration. */
-  @SuppressWarnings("deprecation")
-  public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
-    final IntegrationTestPlugin instance = new IntegrationTestPlugin();
-    instance.onAttachedToEngine(registrar.context(), registrar.messenger());
-  }
 
   @Override
   public void onAttachedToEngine(FlutterPluginBinding binding) {