Reorganize code - 2. (#4909)

polina-c · web-flow · commit e4bba5d085d4 · 2022-12-08T11:55:36.000-08:00
diff --git a/packages/devtools_app/lib/devtools_app.dart b/packages/devtools_app/lib/devtools_app.dart
@@ -72,7 +72,6 @@ export 'src/shared/http/http_request_data.dart';
 export 'src/shared/notifications.dart';
 export 'src/shared/preferences.dart';
 export 'src/shared/primitives/auto_dispose.dart';
-export 'src/shared/primitives/auto_dispose_mixin.dart';
 export 'src/shared/primitives/listenable.dart';
 export 'src/shared/primitives/storage.dart';
 export 'src/shared/primitives/trace_event.dart';
diff --git a/packages/devtools_app/lib/src/app.dart b/packages/devtools_app/lib/src/app.dart
@@ -46,7 +46,7 @@ import 'shared/common_widgets.dart';
 import 'shared/config_specific/server/server.dart';
 import 'shared/dialogs.dart';
 import 'shared/globals.dart';
-import 'shared/primitives/auto_dispose_mixin.dart';
+import 'shared/primitives/auto_dispose.dart';
 import 'shared/routing.dart';
 import 'shared/screen.dart';
 import 'shared/snapshot_screen.dart';
diff --git a/packages/devtools_app/lib/src/framework/initializer.dart b/packages/devtools_app/lib/src/framework/initializer.dart
@@ -11,7 +11,7 @@ import '../shared/analytics/analytics.dart' as ga;
 import '../shared/analytics/constants.dart' as gac;
 import '../shared/common_widgets.dart';
 import '../shared/globals.dart';
-import '../shared/primitives/auto_dispose_mixin.dart';
+import '../shared/primitives/auto_dispose.dart';
 import '../shared/primitives/utils.dart';
 import '../shared/routing.dart';
 import '../shared/theme.dart';
diff --git a/packages/devtools_app/lib/src/framework/notifications_view.dart b/packages/devtools_app/lib/src/framework/notifications_view.dart
@@ -10,7 +10,7 @@ import 'package:flutter/scheduler.dart';
 import '../shared/common_widgets.dart';
 import '../shared/globals.dart';
 import '../shared/notifications.dart';
-import '../shared/primitives/auto_dispose_mixin.dart';
+import '../shared/primitives/auto_dispose.dart';
 import '../shared/primitives/utils.dart';
 import '../shared/theme.dart';
 import '../shared/utils.dart';
diff --git a/packages/devtools_app/lib/src/framework/release_notes/release_notes.dart b/packages/devtools_app/lib/src/framework/release_notes/release_notes.dart
@@ -17,7 +17,7 @@ import '../../shared/common_widgets.dart';
 import '../../shared/config_specific/launch_url/launch_url.dart';
 import '../../shared/config_specific/logger/logger.dart' as logger;
 import '../../shared/config_specific/server/server.dart' as server;
-import '../../shared/primitives/auto_dispose_mixin.dart';
+import '../../shared/primitives/auto_dispose.dart';
 import '../../shared/theme.dart';
 
 const debugTestReleaseNotes = false;
diff --git a/packages/devtools_app/lib/src/framework/scaffold.dart b/packages/devtools_app/lib/src/framework/scaffold.dart
@@ -18,7 +18,7 @@ import '../shared/config_specific/ide_theme/ide_theme.dart';
 import '../shared/config_specific/import_export/import_export.dart';
 import '../shared/framework_controller.dart';
 import '../shared/globals.dart';
-import '../shared/primitives/auto_dispose_mixin.dart';
+import '../shared/primitives/auto_dispose.dart';
 import '../shared/primitives/simple_items.dart';
 import '../shared/routing.dart';
 import '../shared/screen.dart';
diff --git a/packages/devtools_app/lib/src/screens/app_size/app_size_screen.dart b/packages/devtools_app/lib/src/screens/app_size/app_size_screen.dart
@@ -15,7 +15,7 @@ import '../../shared/config_specific/server/server.dart' as server;
 import '../../shared/config_specific/url/url.dart';
 import '../../shared/file_import.dart';
 import '../../shared/globals.dart';
-import '../../shared/primitives/auto_dispose_mixin.dart';
+import '../../shared/primitives/auto_dispose.dart';
 import '../../shared/primitives/simple_items.dart';
 import '../../shared/primitives/utils.dart';
 import '../../shared/screen.dart';
diff --git a/packages/devtools_app/lib/src/screens/debugger/codeview.dart b/packages/devtools_app/lib/src/screens/debugger/codeview.dart
@@ -16,7 +16,7 @@ import '../../shared/dialogs.dart';
 import '../../shared/globals.dart';
 import '../../shared/history_viewport.dart';
 import '../../shared/object_tree.dart';
-import '../../shared/primitives/auto_dispose_mixin.dart';
+import '../../shared/primitives/auto_dispose.dart';
 import '../../shared/primitives/flutter_widgets/linked_scroll_controller.dart';
 import '../../shared/primitives/listenable.dart';
 import '../../shared/primitives/utils.dart';
diff --git a/packages/devtools_app/lib/src/screens/debugger/controls.dart b/packages/devtools_app/lib/src/screens/debugger/controls.dart
@@ -10,7 +10,7 @@ import 'package:vm_service/vm_service.dart';
 
 import '../../shared/common_widgets.dart';
 import '../../shared/globals.dart';
-import '../../shared/primitives/auto_dispose_mixin.dart';
+import '../../shared/primitives/auto_dispose.dart';
 import '../../shared/theme.dart';
 import '../../shared/ui/label.dart';
 import '../../shared/utils.dart';
diff --git a/packages/devtools_app/lib/src/screens/debugger/debugger_screen.dart b/packages/devtools_app/lib/src/screens/debugger/debugger_screen.dart
@@ -15,7 +15,7 @@ import '../../shared/analytics/constants.dart' as gac;
 import '../../shared/common_widgets.dart';
 import '../../shared/flex_split_column.dart';
 import '../../shared/globals.dart';
-import '../../shared/primitives/auto_dispose_mixin.dart';
+import '../../shared/primitives/auto_dispose.dart';
 import '../../shared/primitives/listenable.dart';
 import '../../shared/primitives/simple_items.dart';
 import '../../shared/screen.dart';
diff --git a/packages/devtools_app/lib/src/screens/debugger/evaluate.dart b/packages/devtools_app/lib/src/screens/debugger/evaluate.dart
@@ -12,7 +12,7 @@ import 'package:flutter/services.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../shared/globals.dart';
-import '../../shared/primitives/auto_dispose_mixin.dart';
+import '../../shared/primitives/auto_dispose.dart';
 import '../../shared/primitives/utils.dart';
 import '../../shared/theme.dart';
 import '../../shared/ui/search.dart';
diff --git a/packages/devtools_app/lib/src/screens/debugger/file_search.dart b/packages/devtools_app/lib/src/screens/debugger/file_search.dart
@@ -8,7 +8,7 @@ import 'package:flutter/services.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../shared/globals.dart';
-import '../../shared/primitives/auto_dispose_mixin.dart';
+import '../../shared/primitives/auto_dispose.dart';
 import '../../shared/primitives/utils.dart';
 import '../../shared/ui/search.dart';
 import 'codeview_controller.dart';
diff --git a/packages/devtools_app/lib/src/screens/debugger/program_explorer.dart b/packages/devtools_app/lib/src/screens/debugger/program_explorer.dart
@@ -11,7 +11,7 @@ import 'package:vm_service/vm_service.dart' hide Stack;
 import '../../shared/common_widgets.dart';
 import '../../shared/flex_split_column.dart';
 import '../../shared/globals.dart';
-import '../../shared/primitives/auto_dispose_mixin.dart';
+import '../../shared/primitives/auto_dispose.dart';
 import '../../shared/primitives/utils.dart';
 import '../../shared/theme.dart';
 import '../../shared/tree.dart';
diff --git a/packages/devtools_app/lib/src/screens/inspector/inspector_screen.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_screen.dart
@@ -18,7 +18,7 @@ import '../../shared/dialogs.dart';
 import '../../shared/editable_list.dart';
 import '../../shared/error_badge_manager.dart';
 import '../../shared/globals.dart';
-import '../../shared/primitives/auto_dispose_mixin.dart';
+import '../../shared/primitives/auto_dispose.dart';
 import '../../shared/primitives/blocking_action_mixin.dart';
 import '../../shared/primitives/simple_items.dart';
 import '../../shared/screen.dart';
diff --git a/packages/devtools_app/lib/src/screens/inspector/inspector_tree_controller.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_tree_controller.dart
@@ -20,7 +20,7 @@ import '../../shared/common_widgets.dart';
 import '../../shared/config_specific/logger/logger.dart';
 import '../../shared/error_badge_manager.dart';
 import '../../shared/globals.dart';
-import '../../shared/primitives/auto_dispose_mixin.dart';
+import '../../shared/primitives/auto_dispose.dart';
 import '../../shared/primitives/utils.dart';
 import '../../shared/theme.dart';
 import '../../shared/ui/colors.dart';
diff --git a/packages/devtools_app/lib/src/screens/inspector/layout_explorer/layout_explorer.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/layout_explorer.dart
@@ -4,7 +4,7 @@
 
 import 'package:flutter/widgets.dart';
 
-import '../../../shared/primitives/auto_dispose_mixin.dart';
+import '../../../shared/primitives/auto_dispose.dart';
 import '../diagnostics_node.dart';
 import '../inspector_controller.dart';
 import '../layout_explorer/box/box.dart';
diff --git a/packages/devtools_app/lib/src/screens/logging/logging_screen.dart b/packages/devtools_app/lib/src/screens/logging/logging_screen.dart
@@ -10,7 +10,7 @@ import 'package:provider/provider.dart';
 import '../../service/service_extension_widgets.dart';
 import '../../shared/analytics/analytics.dart' as ga;
 import '../../shared/common_widgets.dart';
-import '../../shared/primitives/auto_dispose_mixin.dart';
+import '../../shared/primitives/auto_dispose.dart';
 import '../../shared/primitives/simple_items.dart';
 import '../../shared/screen.dart';
 import '../../shared/split.dart';
diff --git a/packages/devtools_app/lib/src/screens/memory/memory_screen.dart b/packages/devtools_app/lib/src/screens/memory/memory_screen.dart
@@ -7,7 +7,7 @@ import 'package:flutter/material.dart';
 
 import '../../shared/analytics/analytics.dart' as ga;
 import '../../shared/banner_messages.dart';
-import '../../shared/primitives/auto_dispose_mixin.dart';
+import '../../shared/primitives/auto_dispose.dart';
 import '../../shared/primitives/listenable.dart';
 import '../../shared/primitives/simple_items.dart';
 import '../../shared/screen.dart';
diff --git a/packages/devtools_app/lib/src/screens/memory/panes/chart/chart_control_pane.dart b/packages/devtools_app/lib/src/screens/memory/panes/chart/chart_control_pane.dart
@@ -7,7 +7,7 @@ import 'package:flutter/material.dart';
 import '../../../../shared/analytics/analytics.dart' as ga;
 import '../../../../shared/analytics/constants.dart' as gac;
 import '../../../../shared/common_widgets.dart';
-import '../../../../shared/primitives/auto_dispose_mixin.dart';
+import '../../../../shared/primitives/auto_dispose.dart';
 import '../../../../shared/theme.dart';
 import '../../../../shared/utils.dart';
 import '../../memory_controller.dart';
diff --git a/packages/devtools_app/lib/src/screens/memory/panes/chart/chart_pane.dart b/packages/devtools_app/lib/src/screens/memory/panes/chart/chart_pane.dart
@@ -8,7 +8,7 @@ import 'package:flutter/services.dart';
 import '../../../../shared/charts/chart_controller.dart';
 import '../../../../shared/common_widgets.dart';
 import '../../../../shared/globals.dart';
-import '../../../../shared/primitives/auto_dispose_mixin.dart';
+import '../../../../shared/primitives/auto_dispose.dart';
 import '../../../../shared/primitives/utils.dart';
 import '../../../../shared/theme.dart';
 import '../../../../shared/utils.dart';
diff --git a/packages/devtools_app/lib/src/screens/memory/panes/chart/memory_android_chart.dart b/packages/devtools_app/lib/src/screens/memory/panes/chart/memory_android_chart.dart
@@ -8,7 +8,7 @@ import 'package:flutter/material.dart';
 import '../../../../shared/charts/chart.dart';
 import '../../../../shared/charts/chart_controller.dart';
 import '../../../../shared/charts/chart_trace.dart' as trace;
-import '../../../../shared/primitives/auto_dispose_mixin.dart';
+import '../../../../shared/primitives/auto_dispose.dart';
 import '../../../../shared/theme.dart';
 import '../../../../shared/utils.dart';
 import '../../memory_controller.dart';
diff --git a/packages/devtools_app/lib/src/screens/memory/panes/chart/memory_events_pane.dart b/packages/devtools_app/lib/src/screens/memory/panes/chart/memory_events_pane.dart
@@ -8,7 +8,7 @@ import 'package:flutter/material.dart';
 import '../../../../shared/charts/chart.dart';
 import '../../../../shared/charts/chart_controller.dart';
 import '../../../../shared/charts/chart_trace.dart' as trace;
-import '../../../../shared/primitives/auto_dispose_mixin.dart';
+import '../../../../shared/primitives/auto_dispose.dart';
 import '../../../../shared/theme.dart';
 import '../../../../shared/utils.dart';
 import '../../memory_controller.dart';
diff --git a/packages/devtools_app/lib/src/screens/memory/panes/chart/memory_vm_chart.dart b/packages/devtools_app/lib/src/screens/memory/panes/chart/memory_vm_chart.dart
@@ -8,7 +8,7 @@ import 'package:flutter/material.dart';
 import '../../../../shared/charts/chart.dart';
 import '../../../../shared/charts/chart_controller.dart';
 import '../../../../shared/charts/chart_trace.dart' as trace;
-import '../../../../shared/primitives/auto_dispose_mixin.dart';
+import '../../../../shared/primitives/auto_dispose.dart';
 import '../../../../shared/theme.dart';
 import '../../../../shared/utils.dart';
 import '../../memory_controller.dart';
diff --git a/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/snapshot_list.dart b/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/snapshot_list.dart
@@ -9,7 +9,7 @@ import 'package:flutter/material.dart';
 import '../../../../../shared/analytics/analytics.dart' as ga;
 import '../../../../../shared/analytics/constants.dart' as gac;
 import '../../../../../shared/common_widgets.dart';
-import '../../../../../shared/primitives/auto_dispose_mixin.dart';
+import '../../../../../shared/primitives/auto_dispose.dart';
 import '../../../../../shared/table/table.dart';
 import '../../../../../shared/theme.dart';
 import '../controller/diff_pane_controller.dart';
diff --git a/packages/devtools_app/lib/src/screens/memory/shared/shared_memory_widgets.dart b/packages/devtools_app/lib/src/screens/memory/shared/shared_memory_widgets.dart
@@ -4,8 +4,9 @@
 
 import 'package:flutter/widgets.dart';
 
-import '../../../../devtools_app.dart';
 import '../../../shared/analytics/constants.dart' as gac;
+import '../../../shared/common_widgets.dart';
+import '../../../shared/theme.dart';
 import '../primitives/class_name.dart';
 
 class HeapClassView extends StatelessWidget {
diff --git a/packages/devtools_app/lib/src/screens/network/network_screen.dart b/packages/devtools_app/lib/src/screens/network/network_screen.dart
@@ -14,7 +14,7 @@ import '../../shared/common_widgets.dart';
 import '../../shared/globals.dart';
 import '../../shared/http/curl_command.dart';
 import '../../shared/http/http_request_data.dart';
-import '../../shared/primitives/auto_dispose_mixin.dart';
+import '../../shared/primitives/auto_dispose.dart';
 import '../../shared/primitives/simple_items.dart';
 import '../../shared/primitives/utils.dart';
 import '../../shared/screen.dart';
diff --git a/packages/devtools_app/lib/src/screens/performance/panes/controls/enhance_tracing/enhance_tracing.dart b/packages/devtools_app/lib/src/screens/performance/panes/controls/enhance_tracing/enhance_tracing.dart
@@ -11,7 +11,7 @@ import '../../../../../service/service_extension_widgets.dart';
 import '../../../../../service/service_extensions.dart' as extensions;
 import '../../../../../shared/common_widgets.dart';
 import '../../../../../shared/globals.dart';
-import '../../../../../shared/primitives/auto_dispose_mixin.dart';
+import '../../../../../shared/primitives/auto_dispose.dart';
 import '../../../../../shared/theme.dart';
 import '../../../performance_screen.dart';
 import 'enhance_tracing_controller.dart';
diff --git a/packages/devtools_app/lib/src/screens/performance/panes/controls/layer_debugging_options.dart b/packages/devtools_app/lib/src/screens/performance/panes/controls/layer_debugging_options.dart
@@ -6,8 +6,8 @@ import 'package:flutter/material.dart';
 
 import '../../../../service/service_extension_widgets.dart';
 import '../../../../service/service_extensions.dart' as extensions;
+import '../../../../shared/feature_flags.dart';
 import '../../../../shared/globals.dart';
-import '../../../../shared/primitives/feature_flags.dart';
 import '../../../../shared/theme.dart';
 import '../../performance_screen.dart';
 
diff --git a/packages/devtools_app/lib/src/screens/performance/panes/controls/performance_settings.dart b/packages/devtools_app/lib/src/screens/performance/panes/controls/performance_settings.dart
@@ -8,8 +8,8 @@ import 'package:flutter/material.dart';
 
 import '../../../../shared/common_widgets.dart';
 import '../../../../shared/dialogs.dart';
+import '../../../../shared/feature_flags.dart';
 import '../../../../shared/globals.dart';
-import '../../../../shared/primitives/feature_flags.dart';
 import '../../../../shared/theme.dart';
 import '../../performance_controller.dart';
 
diff --git a/packages/devtools_app/lib/src/screens/performance/panes/flutter_frames/flutter_frames_chart.dart b/packages/devtools_app/lib/src/screens/performance/panes/flutter_frames/flutter_frames_chart.dart
@@ -15,7 +15,7 @@ import '../../../../shared/analytics/metrics.dart';
 import '../../../../shared/banner_messages.dart';
 import '../../../../shared/common_widgets.dart';
 import '../../../../shared/globals.dart';
-import '../../../../shared/primitives/auto_dispose_mixin.dart';
+import '../../../../shared/primitives/auto_dispose.dart';
 import '../../../../shared/primitives/utils.dart';
 import '../../../../shared/theme.dart';
 import '../../../../shared/ui/colors.dart';
diff --git a/packages/devtools_app/lib/src/screens/performance/panes/frame_analysis/frame_analysis.dart b/packages/devtools_app/lib/src/screens/performance/panes/frame_analysis/frame_analysis.dart
@@ -7,8 +7,8 @@ import 'package:flutter/material.dart';
 import '../../../../service/service_extension_widgets.dart';
 import '../../../../service/service_extensions.dart' as extensions;
 import '../../../../shared/common_widgets.dart';
+import '../../../../shared/feature_flags.dart';
 import '../../../../shared/globals.dart';
-import '../../../../shared/primitives/feature_flags.dart';
 import '../../../../shared/theme.dart';
 import '../../../../shared/ui/colors.dart';
 import '../controls/enhance_tracing/enhance_tracing_controller.dart';
diff --git a/packages/devtools_app/lib/src/screens/performance/panes/rebuild_stats/rebuild_stats.dart b/packages/devtools_app/lib/src/screens/performance/panes/rebuild_stats/rebuild_stats.dart
@@ -10,7 +10,7 @@ import '../../../../service/service_extension_widgets.dart';
 import '../../../../service/service_extensions.dart' as extensions;
 import '../../../../shared/common_widgets.dart';
 import '../../../../shared/globals.dart';
-import '../../../../shared/primitives/auto_dispose_mixin.dart';
+import '../../../../shared/primitives/auto_dispose.dart';
 import '../../../../shared/primitives/utils.dart';
 import '../../../../shared/table/table.dart';
 import '../../../../shared/table/table_data.dart';
diff --git a/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/legacy/timeline_flame_chart.dart b/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/legacy/timeline_flame_chart.dart
@@ -12,7 +12,7 @@ import 'package:flutter/material.dart';
 import '../../../../../shared/charts/flame_chart.dart';
 import '../../../../../shared/common_widgets.dart';
 import '../../../../../shared/globals.dart';
-import '../../../../../shared/primitives/auto_dispose_mixin.dart';
+import '../../../../../shared/primitives/auto_dispose.dart';
 import '../../../../../shared/primitives/flutter_widgets/linked_scroll_controller.dart';
 import '../../../../../shared/primitives/geometry.dart';
 import '../../../../../shared/primitives/trace_event.dart';
diff --git a/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/_perfetto_web.dart b/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/_perfetto_web.dart
@@ -11,7 +11,6 @@ import 'package:flutter/material.dart';
 
 import '../../../../../shared/globals.dart';
 import '../../../../../shared/primitives/auto_dispose.dart';
-import '../../../../../shared/primitives/auto_dispose_mixin.dart';
 import '../../../../../shared/primitives/trace_event.dart';
 import '../../../../../shared/primitives/utils.dart';
 import '_perfetto_controller_web.dart';
diff --git a/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/timeline_events_controller.dart b/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/timeline_events_controller.dart
@@ -12,11 +12,11 @@ import '../../../../shared/analytics/constants.dart' as gac;
 import '../../../../shared/analytics/metrics.dart';
 import '../../../../shared/config_specific/logger/allowed_error.dart';
 import '../../../../shared/config_specific/logger/logger.dart';
+import '../../../../shared/feature_flags.dart';
 import '../../../../shared/future_work_tracker.dart';
 import '../../../../shared/globals.dart';
 import '../../../../shared/http/http_service.dart';
 import '../../../../shared/primitives/auto_dispose.dart';
-import '../../../../shared/primitives/feature_flags.dart';
 import '../../../../shared/primitives/trace_event.dart';
 import '../../../../shared/primitives/trees.dart';
 import '../../../../shared/primitives/utils.dart';
diff --git a/packages/devtools_app/lib/src/screens/performance/performance_controller.dart b/packages/devtools_app/lib/src/screens/performance/performance_controller.dart
@@ -7,9 +7,9 @@ import 'dart:async';
 import 'package:vm_service/vm_service.dart';
 
 import '../../shared/config_specific/import_export/import_export.dart';
+import '../../shared/feature_flags.dart';
 import '../../shared/globals.dart';
 import '../../shared/primitives/auto_dispose.dart';
-import '../../shared/primitives/feature_flags.dart';
 import '../inspector/inspector_service.dart';
 import 'panes/controls/enhance_tracing/enhance_tracing_controller.dart';
 import 'panes/flutter_frames/flutter_frame_model.dart';
diff --git a/packages/devtools_app/lib/src/screens/performance/performance_screen.dart b/packages/devtools_app/lib/src/screens/performance/performance_screen.dart
@@ -14,7 +14,7 @@ import '../../shared/analytics/constants.dart' as gac;
 import '../../shared/banner_messages.dart';
 import '../../shared/common_widgets.dart';
 import '../../shared/globals.dart';
-import '../../shared/primitives/auto_dispose_mixin.dart';
+import '../../shared/primitives/auto_dispose.dart';
 import '../../shared/primitives/simple_items.dart';
 import '../../shared/screen.dart';
 import '../../shared/theme.dart';
diff --git a/packages/devtools_app/lib/src/screens/performance/tabbed_performance_view.dart b/packages/devtools_app/lib/src/screens/performance/tabbed_performance_view.dart
@@ -9,9 +9,9 @@ import 'package:flutter/material.dart';
 import '../../shared/analytics/constants.dart' as gac;
 import '../../shared/charts/flame_chart.dart';
 import '../../shared/common_widgets.dart';
+import '../../shared/feature_flags.dart';
 import '../../shared/globals.dart';
-import '../../shared/primitives/auto_dispose_mixin.dart';
-import '../../shared/primitives/feature_flags.dart';
+import '../../shared/primitives/auto_dispose.dart';
 import '../../shared/theme.dart';
 import '../../shared/ui/search.dart';
 import '../../shared/ui/tab.dart';
diff --git a/packages/devtools_app/lib/src/screens/profiler/cpu_profiler.dart b/packages/devtools_app/lib/src/screens/profiler/cpu_profiler.dart
@@ -12,7 +12,7 @@ import '../../shared/charts/flame_chart.dart';
 import '../../shared/common_widgets.dart';
 import '../../shared/dialogs.dart';
 import '../../shared/globals.dart';
-import '../../shared/primitives/auto_dispose_mixin.dart';
+import '../../shared/primitives/auto_dispose.dart';
 import '../../shared/theme.dart';
 import '../../shared/ui/colors.dart';
 import '../../shared/ui/filter.dart';
diff --git a/packages/devtools_app/lib/src/screens/profiler/profiler_screen.dart b/packages/devtools_app/lib/src/screens/profiler/profiler_screen.dart
@@ -13,7 +13,7 @@ import '../../shared/analytics/constants.dart' as gac;
 import '../../shared/banner_messages.dart';
 import '../../shared/common_widgets.dart';
 import '../../shared/globals.dart';
-import '../../shared/primitives/auto_dispose_mixin.dart';
+import '../../shared/primitives/auto_dispose.dart';
 import '../../shared/primitives/listenable.dart';
 import '../../shared/primitives/simple_items.dart';
 import '../../shared/screen.dart';
diff --git a/packages/devtools_app/lib/src/screens/vm_developer/vm_developer_tools_screen.dart b/packages/devtools_app/lib/src/screens/vm_developer/vm_developer_tools_screen.dart
@@ -5,7 +5,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
-import '../../shared/primitives/auto_dispose_mixin.dart';
+import '../../shared/primitives/auto_dispose.dart';
 import '../../shared/primitives/simple_items.dart';
 import '../../shared/screen.dart';
 import '../../shared/theme.dart';
diff --git a/packages/devtools_app/lib/src/service/service_extension_widgets.dart b/packages/devtools_app/lib/src/service/service_extension_widgets.dart
@@ -12,7 +12,7 @@ import '../shared/analytics/analytics.dart' as ga;
 import '../shared/common_widgets.dart';
 import '../shared/config_specific/logger/logger.dart';
 import '../shared/globals.dart';
-import '../shared/primitives/auto_dispose_mixin.dart';
+import '../shared/primitives/auto_dispose.dart';
 import '../shared/primitives/message_bus.dart';
 import '../shared/primitives/utils.dart';
 import '../shared/theme.dart';
diff --git a/packages/devtools_app/lib/src/shared/README.md b/packages/devtools_app/lib/src/shared/README.md
@@ -1,6 +1,6 @@
 This folder contains code shared between screens.
 
-This folder contains higher level libraries, i.e. ones, that depend on other libraries in this package.
-Lower level code, i.e. code that does not depend on other code in this package, should go to the folder 'primitives'.
+For clarity of contracts, it is preferred that code in this folder
+does not depend on any `devtools_app` code outside this folder.
 
 Code, that is not used by any screen, should go to the folder `framework`.
diff --git a/packages/devtools_app/lib/src/shared/charts/chart.dart b/packages/devtools_app/lib/src/shared/charts/chart.dart
diff --git a/packages/devtools_app/lib/src/shared/charts/flame_chart.dart b/packages/devtools_app/lib/src/shared/charts/flame_chart.dart
diff --git a/packages/devtools_app/lib/src/shared/common_widgets.dart b/packages/devtools_app/lib/src/shared/common_widgets.dart
diff --git a/packages/devtools_app/lib/src/shared/console.dart b/packages/devtools_app/lib/src/shared/console.dart
diff --git a/packages/devtools_app/lib/src/shared/device_dialog.dart b/packages/devtools_app/lib/src/shared/device_dialog.dart
diff --git a/packages/devtools_app/lib/src/shared/feature_flags.dart b/packages/devtools_app/lib/src/shared/feature_flags.dart
diff --git a/packages/devtools_app/lib/src/shared/primitives/README.md b/packages/devtools_app/lib/src/shared/primitives/README.md
diff --git a/packages/devtools_app/lib/src/shared/primitives/auto_dispose.dart b/packages/devtools_app/lib/src/shared/primitives/auto_dispose.dart
diff --git a/packages/devtools_app/lib/src/shared/primitives/auto_dispose_mixin.dart b/packages/devtools_app/lib/src/shared/primitives/auto_dispose_mixin.dart
diff --git a/packages/devtools_app/lib/src/shared/table/table.dart b/packages/devtools_app/lib/src/shared/table/table.dart
diff --git a/packages/devtools_app/lib/src/shared/tree.dart b/packages/devtools_app/lib/src/shared/tree.dart
diff --git a/packages/devtools_app/lib/src/shared/ui/filter.dart b/packages/devtools_app/lib/src/shared/ui/filter.dart
diff --git a/packages/devtools_app/lib/src/shared/ui/search.dart b/packages/devtools_app/lib/src/shared/ui/search.dart
diff --git a/packages/devtools_app/test/primitives/feature_flags_test.dart b/packages/devtools_app/test/primitives/feature_flags_test.dart
diff --git a/packages/devtools_app/test/shared/auto_dispose_mixin_test.dart b/packages/devtools_app/test/shared/auto_dispose_mixin_test.dart
diff --git a/packages/devtools_app/test/test_infra/scenes/performance/default.dart b/packages/devtools_app/test/test_infra/scenes/performance/default.dart
