Remove duplicated devtools_shared code from dds.

Fixes flutter/devtools#3571.

Change-Id: I168b44ef0e59a16695ce824499dff774ba46f3d1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/239800
Reviewed-by: Ben Konyi <[email protected]>
Commit-Queue: Kenzie Davisson <[email protected]>

Author: kenzieschmoll

pkg/dds/lib/devtools_server.dart

@@ -7,6 +7,7 @@ import 'dart:io';
 
 import 'package:args/args.dart';
 import 'package:browser_launcher/browser_launcher.dart';
+import 'package:devtools_shared/devtools_shared.dart';
 import 'package:http_multi_server/http_multi_server.dart';
 import 'package:path/path.dart' as path;
 import 'package:shelf/shelf.dart' as shelf;
@@ -291,7 +292,7 @@ class DevToolsServer {
     if (launchBrowser) {
       if (serviceProtocolUri != null) {
         serviceProtocolUri =
-            _normalizeVmServiceUri(serviceProtocolUri).toString();
+            normalizeVmServiceUri(serviceProtocolUri).toString();
       }
 
       final queryParameters = {
@@ -674,23 +675,4 @@ class DevToolsServer {
     };
     return uri.hasPort && tunneledPorts.contains(uri.port);
   }
-
-  // TODO(https://github.com/flutter/devtools/issues/3571): move to devtools_shared.
-  // Note: please keep this copy of normalizeVmServiceUri() in sync with the one
-  // in devtools_app.
-  Uri? _normalizeVmServiceUri(String value) {
-    value = value.trim();
-
-    // Cleanup encoded urls likely copied from the uri of an existing running
-    // DevTools app.
-    if (value.contains('%3A%2F%2F')) {
-      value = Uri.decodeFull(value);
-    }
-    final uri = Uri.parse(value.trim()).removeFragment();
-    if (!uri.isAbsolute) {
-      return null;
-    }
-    if (uri.path.endsWith('/')) return uri;
-    return uri.replace(path: uri.path);
-  }
 }

pkg/dds/lib/src/devtools/memory_profile.dart

@@ -12,8 +12,6 @@ import 'package:collection/collection.dart';
 import 'package:devtools_shared/devtools_shared.dart';
 import 'package:vm_service/vm_service.dart';
 
-import 'service_registrations.dart' as service_registrations;
-
 class MemoryProfile {
   MemoryProfile(this.service, String profileFilename, this._verboseMode) {
     onConnectionClosed.listen(_handleConnectionStop);
@@ -77,7 +75,7 @@ class MemoryProfile {
 
   Future<Response?> getAdbMemoryInfo() async {
     return await callService(
-      service_registrations.flutterMemory.service,
+      flutterMemory.service,
       isolateId: _selectedIsolate.id,
     );
   }
@@ -221,7 +219,7 @@ class MemoryProfile {
   /// @throws Exception if no 'FlutterView'.
   Future<String?> getFlutterViewId(IsolateRef selectedIsolate) async {
     final flutterViewListResponse = await service!.callServiceExtension(
-      service_registrations.flutterListViews,
+      flutterListViews,
       isolateId: selectedIsolate.id,
     );
     final List<dynamic> views =
@@ -253,7 +251,7 @@ class MemoryProfile {
     final viewId = await getFlutterViewId(selectedIsolate);
 
     return await service!.callServiceExtension(
-      service_registrations.flutterEngineRasterCache,
+      flutterEngineRasterCache,
       args: {'viewId': viewId},
       isolateId: selectedIsolate.id,
     );

pkg/dds/lib/src/devtools/service_registrations.dart

@@ -16,7 +16,7 @@ dependencies:
   browser_launcher: ^1.0.0
   collection: ^1.15.0
   dds_service_extensions: ^1.3.0
-  devtools_shared: ^2.11.4
+  devtools_shared: ^2.12.1
   http_multi_server: ^3.0.0
   json_rpc_2: ^3.0.0
   meta: ^1.1.8