Revert "[flutter_tools] refactor drive launch into separate service, split by mobile+desktop and web (flutter#68451)" (flutter#68845)

This reverts commit 2e75f52.

Author: Jonah Williams

packages/flutter_tools/lib/executable.dart

@@ -95,10 +95,7 @@ Future<void> main(List<String> args) async {
     DevicesCommand(),
     DoctorCommand(verbose: verbose),
     DowngradeCommand(),
-    DriveCommand(verboseHelp: verboseHelp,
-      fileSystem: globals.fs,
-      logger: globals.logger,
-    ),
+    DriveCommand(verboseHelp: verboseHelp),
     EmulatorsCommand(),
     FormatCommand(),
     GenerateCommand(),

packages/flutter_tools/lib/src/android/android_device.dart

@@ -590,17 +590,13 @@ class AndroidDevice extends Device {
     }
 
     final bool traceStartup = platformArgs['trace-startup'] as bool ?? false;
+    _logger.printTrace('$this startApp');
+
     ProtocolDiscovery observatoryDiscovery;
 
     if (debuggingOptions.debuggingEnabled) {
       observatoryDiscovery = ProtocolDiscovery.observatory(
-        // Avoid using getLogReader, which returns a singleton instance, because the
-        // observatory discovery will dipose at the end. creating a new logger here allows
-        // logs to be surfaced normally during `flutter drive`.
-        await AdbLogReader.createLogReader(
-          this,
-          _processManager,
-        ),
+        await getLogReader(),
         portForwarder: portForwarder,
         hostPort: debuggingOptions.hostVmServicePort,
         devicePort: debuggingOptions.deviceVmServicePort,
@@ -673,6 +669,8 @@ class AndroidDevice extends Device {
     // Wait for the service protocol port here. This will complete once the
     // device has printed "Observatory is listening on...".
     _logger.printTrace('Waiting for observatory port to be available...');
+
+    // TODO(danrubel): Waiting for observatory services can be made common across all devices.
     try {
       Uri observatoryUri;
       if (debuggingOptions.buildInfo.isDebug || debuggingOptions.buildInfo.isProfile) {

packages/flutter_tools/lib/src/build_system/targets/web.dart

@@ -22,6 +22,9 @@ import 'assets.dart';
 import 'common.dart';
 import 'localizations.dart';
 
+/// Whether web builds should call the platform initialization logic.
+const String kInitializePlatform = 'InitializePlatform';
+
 /// Whether the application has web plugins.
 const String kHasWebPlugins = 'HasWebPlugins';
 
@@ -86,6 +89,7 @@ class WebEntrypointTarget extends Target {
   @override
   Future<void> build(Environment environment) async {
     final String targetFile = environment.defines[kTargetFile];
+    final bool shouldInitializePlatform = environment.defines[kInitializePlatform] == 'true';
     final bool hasPlugins = environment.defines[kHasWebPlugins] == 'true';
     final Uri importUri = environment.fileSystem.file(targetFile).absolute.uri;
     // TODO(jonahwilliams): support configuration of this file.
@@ -133,7 +137,9 @@ import '$mainImport' as entrypoint;
 
 Future<void> main() async {
   registerPlugins(webPluginRegistry);
-  await ui.webOnlyInitializePlatform();
+  if ($shouldInitializePlatform) {
+    await ui.webOnlyInitializePlatform();
+  }
   entrypoint.main();
 }
 ''';
@@ -146,7 +152,9 @@ import 'dart:ui' as ui;
 import '$mainImport' as entrypoint;
 
 Future<void> main() async {
-  await ui.webOnlyInitializePlatform();
+  if ($shouldInitializePlatform) {
+    await ui.webOnlyInitializePlatform();
+  }
   entrypoint.main();
 }
 ''';

packages/flutter_tools/lib/src/commands/attach.dart

@@ -384,6 +384,7 @@ known, it can be explicitly provided to attach via the command-line, e.g.
 
     final FlutterDevice flutterDevice = await FlutterDevice.create(
       device,
+      flutterProject: flutterProject,
       fileSystemRoots: stringsArg('filesystem-root'),
       fileSystemScheme: stringArg('filesystem-scheme'),
       target: stringArg('target'),

packages/flutter_tools/lib/src/commands/build_web.dart

@@ -25,6 +25,12 @@ class BuildWebCommand extends BuildSubCommand {
     usesDartDefineOption();
     addEnableExperimentation(hide: !verboseHelp);
     addNullSafetyModeOptions(hide: !verboseHelp);
+    argParser.addFlag('web-initialize-platform',
+        defaultsTo: true,
+        negatable: true,
+        hide: true,
+        help: 'Whether to automatically invoke webOnlyInitializePlatform.',
+    );
     argParser.addFlag('csp',
       defaultsTo: false,
       negatable: false,
@@ -86,6 +92,7 @@ class BuildWebCommand extends BuildSubCommand {
       flutterProject,
       target,
       buildInfo,
+      boolArg('web-initialize-platform'),
       boolArg('csp'),
       stringArg('pwa-strategy'),
       boolArg('source-maps')

packages/flutter_tools/lib/src/commands/daemon.dart

@@ -466,6 +466,7 @@ class AppDomain extends Domain {
 
     final FlutterDevice flutterDevice = await FlutterDevice.create(
       device,
+      flutterProject: flutterProject,
       target: target,
       buildInfo: options.buildInfo,
       platform: globals.platform,