[CFE] Move front-end API under src/

This CL deprecates the front-end API and moves it into src/api_prototype.

For now all usages have been updated to point to the new location,
but they should be updated to use custom-client invocations instead (e.g.
one specific way for DDC, another for dart2js etc.)

Bug:
Change-Id: I9b4f41f6ebf55d42510fd35240d942d1dc7292d6
Reviewed-on: https://dart-review.googlesource.com/24822
Commit-Queue: Jens Johansen <jensj@google.com>
Reviewed-by: Kevin Millikin <kmillikin@google.com>

pkg/analysis_server/lib/src/analysis_server.dart

@@ -65,7 +65,7 @@ import 'package:analyzer/src/generated/utilities_general.dart';
 import 'package:analyzer/src/util/glob.dart';
 import 'package:analyzer_plugin/protocol/protocol_common.dart' hide Element;
 import 'package:analyzer_plugin/src/utilities/navigation/navigation.dart';
-import 'package:front_end/byte_store.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:telemetry/crash_reporting.dart';
 import 'package:telemetry/telemetry.dart' as telemetry;

pkg/analysis_server/test/abstract_context.dart

@@ -17,7 +17,7 @@ import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/engine.dart' as engine;
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source_io.dart';
-import 'package:front_end/byte_store.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 
 import 'mock_sdk.dart';

pkg/analysis_server/test/context_manager_test.dart

@@ -26,7 +26,7 @@ import 'package:analyzer/src/generated/source_io.dart';
 import 'package:analyzer/src/services/lint.dart';
 import 'package:analyzer/src/summary/summary_file_builder.dart';
 import 'package:analyzer/src/util/glob.dart';
-import 'package:front_end/byte_store.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:linter/src/rules.dart';
 import 'package:linter/src/rules/avoid_as.dart';

pkg/analysis_server/test/services/search/search_engine_test.dart

@@ -14,7 +14,7 @@ import 'package:analyzer/src/dart/analysis/file_state.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source.dart';
-import 'package:front_end/byte_store.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';

pkg/analysis_server/test/src/plugin/plugin_watcher_test.dart

@@ -17,7 +17,7 @@ import 'package:analyzer/src/dart/analysis/file_state.dart';
 import 'package:analyzer/src/dart/analysis/session.dart';
 import 'package:analyzer/src/generated/engine.dart' show AnalysisOptionsImpl;
 import 'package:analyzer/src/generated/source.dart';
-import 'package:front_end/byte_store.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:path/path.dart' as path;
 import 'package:test/test.dart';

pkg/analyzer/lib/src/context/builder.dart

@@ -33,7 +33,7 @@ import 'package:analyzer/src/services/lint.dart';
 import 'package:analyzer/src/summary/summary_sdk.dart';
 import 'package:analyzer/src/task/options.dart';
 import 'package:args/args.dart';
-import 'package:front_end/byte_store.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:package_config/packages.dart';
 import 'package:package_config/packages_file.dart';

pkg/analyzer/lib/src/dart/analysis/byte_store.dart

@@ -5,5 +5,5 @@
 // This library re-exports the parts of front_end's byte_store.dart whose API is
 // stable enough to be relied upon by clients.
 
-export 'package:front_end/byte_store.dart'
+export 'package:front_end/src/api_prototype/byte_store.dart'
     show ByteStore, MemoryByteStore, MemoryCachingByteStore;

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -40,7 +40,7 @@ import 'package:analyzer/src/lint/registry.dart' as linter;
 import 'package:analyzer/src/summary/format.dart';
 import 'package:analyzer/src/summary/idl.dart';
 import 'package:analyzer/src/summary/package_bundle_reader.dart';
-import 'package:front_end/byte_store.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
 import 'package:front_end/src/base/api_signature.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:front_end/src/incremental/kernel_driver.dart' show KernelDriver;

pkg/analyzer/lib/src/dart/analysis/file_byte_store.dart

@@ -5,4 +5,4 @@
 // This library re-exports the parts of front_end's file_byte_store.dart whose
 // API is stable enough to be relied upon by clients.
 
-export 'package:front_end/byte_store.dart' show FileByteStore;
+export 'package:front_end/src/api_prototype/byte_store.dart' show FileByteStore;

pkg/analyzer/lib/src/dart/analysis/file_state.dart

@@ -27,7 +27,7 @@ import 'package:analyzer/src/summary/package_bundle_reader.dart';
 import 'package:analyzer/src/summary/summarize_ast.dart';
 import 'package:convert/convert.dart';
 import 'package:crypto/crypto.dart';
-import 'package:front_end/byte_store.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
 import 'package:front_end/src/base/api_signature.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:front_end/src/fasta/scanner/token.dart';

pkg/analyzer/lib/src/dart/analysis/frontend_resolution.dart

@@ -1,5 +1,5 @@
 import 'package:analyzer/src/fasta/resolution_storer.dart';
-import 'package:front_end/file_system.dart';
+import 'package:front_end/src/api_prototype/file_system.dart';
 import 'package:front_end/src/fasta/builder/builder.dart';
 import 'package:front_end/src/fasta/builder/library_builder.dart';
 import 'package:front_end/src/fasta/dill/dill_target.dart';

pkg/analyzer/lib/src/dart/analysis/kernel_context.dart

@@ -18,9 +18,9 @@ import 'package:analyzer/src/generated/engine.dart'
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/kernel/resynthesize.dart';
-import 'package:front_end/byte_store.dart';
-import 'package:front_end/compiler_options.dart';
-import 'package:front_end/file_system.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
+import 'package:front_end/src/api_prototype/compiler_options.dart';
+import 'package:front_end/src/api_prototype/file_system.dart';
 import 'package:front_end/src/base/libraries_specification.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:front_end/src/base/processed_options.dart';

pkg/analyzer/lib/src/dart/analysis/library_context.dart

@@ -17,7 +17,7 @@ import 'package:analyzer/src/summary/format.dart';
 import 'package:analyzer/src/summary/idl.dart';
 import 'package:analyzer/src/summary/link.dart';
 import 'package:analyzer/src/summary/package_bundle_reader.dart';
-import 'package:front_end/byte_store.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 
 /**

pkg/analyzer/lib/src/lint/analysis.dart

@@ -24,7 +24,7 @@ import 'package:analyzer/src/lint/project.dart';
 import 'package:analyzer/src/lint/registry.dart';
 import 'package:analyzer/src/services/lint.dart';
 import 'package:analyzer/src/util/sdk.dart';
-import 'package:front_end/byte_store.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:package_config/packages.dart' show Packages;
 import 'package:package_config/packages_file.dart' as pkgfile show parse;

pkg/analyzer/test/generated/resolver_test_case.dart

@@ -27,7 +27,7 @@ import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source_io.dart';
 import 'package:analyzer/src/generated/testing/ast_test_factory.dart';
 import 'package:analyzer/src/generated/testing/element_factory.dart';
-import 'package:front_end/byte_store.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:test/test.dart';
 

pkg/analyzer/test/src/dart/analysis/base.dart

@@ -14,7 +14,7 @@ import 'package:analyzer/src/generated/engine.dart' show AnalysisOptionsImpl;
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/summary/package_bundle_reader.dart';
-import 'package:front_end/byte_store.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:mockito/mockito.dart';
 import 'package:test/test.dart';

pkg/analyzer/test/src/dart/analysis/driver_test.dart

@@ -28,7 +28,7 @@ import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/utilities_dart.dart';
 import 'package:analyzer/src/summary/idl.dart';
 import 'package:analyzer/src/summary/package_bundle_reader.dart';
-import 'package:front_end/byte_store.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:mockito/mockito.dart';
 import 'package:test/test.dart';

pkg/analyzer/test/src/dart/analysis/file_state_test.dart

@@ -15,7 +15,7 @@ import 'package:analyzer/src/generated/engine.dart'
 import 'package:analyzer/src/generated/source.dart';
 import 'package:convert/convert.dart';
 import 'package:crypto/crypto.dart';
-import 'package:front_end/byte_store.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:mockito/mockito.dart';
 import 'package:test/test.dart';

pkg/analyzer/test/src/summary/resynthesize_kernel_test.dart

@@ -14,9 +14,9 @@ import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/kernel/resynthesize.dart';
-import 'package:front_end/byte_store.dart';
-import 'package:front_end/compiler_options.dart';
-import 'package:front_end/file_system.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
+import 'package:front_end/src/api_prototype/compiler_options.dart';
+import 'package:front_end/src/api_prototype/file_system.dart';
 import 'package:front_end/src/base/libraries_specification.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:front_end/src/base/processed_options.dart';

pkg/analyzer/test/src/task/strong/strong_test_helper.dart

@@ -23,7 +23,7 @@ import 'package:analyzer/src/dart/ast/token.dart';
 import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';
-import 'package:front_end/byte_store.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:source_span/source_span.dart';
 import 'package:test/test.dart';

pkg/analyzer/tool/task_dependency_graph/generate.dart

@@ -37,7 +37,7 @@ import 'package:analyzer/src/generated/resolver.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/source_io.dart';
-import 'package:front_end/byte_store.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:front_end/src/codegen/tools.dart';
 import 'package:front_end/src/testing/package_root.dart' as package_root;

pkg/analyzer_cli/lib/src/build_mode.dart

@@ -31,7 +31,7 @@ import 'package:analyzer_cli/src/options.dart';
 import 'package:bazel_worker/bazel_worker.dart';
 import 'package:collection/collection.dart';
 import 'package:convert/convert.dart';
-import 'package:front_end/byte_store.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:front_end/src/byte_store/cache.dart';
 

pkg/analyzer_cli/lib/src/driver.dart

@@ -39,7 +39,7 @@ import 'package:analyzer_cli/src/error_severity.dart';
 import 'package:analyzer_cli/src/options.dart';
 import 'package:analyzer_cli/src/perf_report.dart';
 import 'package:analyzer_cli/starter.dart' show CommandLineStarter;
-import 'package:front_end/byte_store.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:linter/src/rules.dart' as linter;
 import 'package:meta/meta.dart';

pkg/compiler/lib/src/kernel/front_end_adapter.dart

@@ -8,7 +8,7 @@ library compiler.kernel.front_end_adapter;
 
 import 'dart:async';
 
-import 'package:front_end/front_end.dart' as fe;
+import 'package:front_end/src/api_prototype/front_end.dart' as fe;
 
 import '../../compiler_new.dart' as api;
 

pkg/compiler/lib/src/library_loader.dart

@@ -6,7 +6,7 @@ library dart2js.library_loader;
 
 import 'dart:async';
 
-import 'package:front_end/front_end.dart' as fe;
+import 'package:front_end/src/api_prototype/front_end.dart' as fe;
 import 'package:kernel/ast.dart' as ir;
 import 'package:kernel/binary/ast_from_binary.dart' show BinaryBuilder;
 import 'package:kernel/kernel.dart' hide LibraryDependency, Combinator;

pkg/compiler/tool/generate_kernel.dart

@@ -13,7 +13,7 @@ import 'dart:io';
 import 'package:args/args.dart';
 import 'package:compiler/src/kernel/dart2js_target.dart';
 import 'package:compiler/src/filenames.dart';
-import 'package:front_end/front_end.dart';
+import 'package:front_end/src/api_prototype/front_end.dart';
 import 'package:front_end/src/compute_platform_binaries_location.dart'
     show computePlatformBinariesLocation;
 import 'package:front_end/src/fasta/util/relativize.dart';

pkg/dev_compiler/lib/src/kernel/command.dart

@@ -7,8 +7,8 @@ import 'dart:convert' show JSON;
 import 'dart:io';
 import 'package:args/args.dart';
 import 'package:dev_compiler/src/kernel/target.dart';
-import 'package:front_end/compilation_message.dart';
-import 'package:front_end/compiler_options.dart';
+import 'package:front_end/src/api_prototype/compilation_message.dart';
+import 'package:front_end/src/api_prototype/compiler_options.dart';
 import 'package:front_end/src/kernel_generator_impl.dart';
 import 'package:front_end/src/base/processed_options.dart';
 import 'package:kernel/kernel.dart';

pkg/dev_compiler/tool/build_pkgs.dart

@@ -3,9 +3,9 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:args/args.dart';
-import 'package:front_end/compilation_message.dart';
-import 'package:front_end/compiler_options.dart';
-import 'package:front_end/summary_generator.dart';
+import 'package:front_end/src/api_prototype/compilation_message.dart';
+import 'package:front_end/src/api_prototype/compiler_options.dart';
+import 'package:front_end/src/api_prototype/summary_generator.dart';
 import 'package:path/path.dart' as p;
 
 import 'package:dev_compiler/src/analyzer/command.dart' as analyzer;

pkg/dev_compiler/tool/kernel_sdk.dart

@@ -8,8 +8,8 @@ import 'dart:async';
 import 'package:dev_compiler/src/compiler/module_builder.dart';
 import 'package:dev_compiler/src/kernel/target.dart';
 import 'package:dev_compiler/src/kernel/command.dart';
-import 'package:front_end/compiler_options.dart';
-import 'package:front_end/kernel_generator.dart';
+import 'package:front_end/src/api_prototype/compiler_options.dart';
+import 'package:front_end/src/api_prototype/kernel_generator.dart';
 import 'package:kernel/kernel.dart';
 import 'package:path/path.dart' as path;
 import 'patch_sdk.dart' as patch_sdk;

pkg/front_end/example/incremental_reload/compiler_with_invalidation.dart

@@ -10,9 +10,9 @@ library front_end.example.incremental_reload.compiler_with_invalidation;
 import 'dart:io';
 import 'dart:async';
 
-import 'package:front_end/byte_store.dart';
-import 'package:front_end/compiler_options.dart';
-import 'package:front_end/incremental_kernel_generator.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
+import 'package:front_end/src/api_prototype/compiler_options.dart';
+import 'package:front_end/src/api_prototype/incremental_kernel_generator.dart';
 import 'package:kernel/ast.dart';
 import 'package:kernel/binary/limited_ast_to_binary.dart';
 import 'package:kernel/target/targets.dart';

pkg/front_end/lib/src/api_prototype/compiler_options.dart

@@ -4,7 +4,7 @@
 
 library front_end.compiler_options;
 
-import 'package:front_end/byte_store.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:kernel/target/targets.dart' show Target;
 

pkg/front_end/lib/src/api_prototype/dependency_grapher.dart

@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:front_end/compiler_options.dart';
+import 'package:front_end/src/api_prototype/compiler_options.dart';
 import 'package:front_end/src/base/processed_options.dart';
 import 'package:front_end/src/dependency_grapher_impl.dart' as impl;
 

pkg/front_end/lib/src/api_prototype/kernel_generator.dart

@@ -11,11 +11,11 @@ import 'dart:async';
 import 'package:kernel/kernel.dart' show Program;
 
 import 'compiler_options.dart';
-import 'src/base/processed_options.dart';
-import 'src/fasta/fasta_codes.dart';
-import 'src/fasta/compiler_context.dart';
-import 'src/fasta/severity.dart';
-import 'src/kernel_generator_impl.dart';
+import '../base/processed_options.dart';
+import '../fasta/fasta_codes.dart';
+import '../fasta/compiler_context.dart';
+import '../fasta/severity.dart';
+import '../kernel_generator_impl.dart';
 
 /// Generates a kernel representation of the program whose main library is in
 /// the given [source].

pkg/front_end/lib/src/api_prototype/summary_generator.dart

@@ -8,8 +8,8 @@ library front_end.summary_generator;
 import 'dart:async';
 import 'compiler_options.dart';
 
-import 'src/base/processed_options.dart';
-import 'src/kernel_generator_impl.dart';
+import '../base/processed_options.dart';
+import '../kernel_generator_impl.dart';
 
 /// Creates a summary representation of the build unit whose source files are in
 /// [sources].

pkg/front_end/lib/src/base/processed_options.dart

@@ -4,10 +4,10 @@
 
 import 'dart:async';
 
-import 'package:front_end/compilation_message.dart';
-import 'package:front_end/byte_store.dart';
-import 'package:front_end/compiler_options.dart';
-import 'package:front_end/file_system.dart';
+import 'package:front_end/src/api_prototype/compilation_message.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
+import 'package:front_end/src/api_prototype/compiler_options.dart';
+import 'package:front_end/src/api_prototype/file_system.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:front_end/src/fasta/fasta_codes.dart';
 import 'package:front_end/src/fasta/problems.dart' show unimplemented;

pkg/front_end/lib/src/dependency_grapher_impl.dart

@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:front_end/dependency_grapher.dart';
+import 'package:front_end/src/api_prototype/dependency_grapher.dart';
 import 'package:front_end/src/async_dependency_walker.dart';
 import 'package:front_end/src/base/processed_options.dart';
 import 'package:front_end/src/fasta/parser.dart';
@@ -22,7 +22,7 @@ import 'package:front_end/src/fasta/uri_translator.dart';
 /// they are read directly from `options.fileSystem`.
 ///
 /// This is intended for internal use by the front end.  Clients should use
-/// package:front_end/dependency_grapher.dart.
+/// package:front_end/src/api_prototype/dependency_grapher.dart.
 Future<Graph> graphForProgram(List<Uri> sources, ProcessedOptions options,
     {FileReader fileReader}) async {
   UriTranslator uriTranslator = await options.getUriTranslator();

pkg/front_end/lib/src/fasta/compiler_context.dart

@@ -6,8 +6,8 @@ library fasta.compiler_context;
 
 import 'dart:async' show Zone, runZoned;
 
-import 'package:front_end/compiler_options.dart';
-import 'package:front_end/file_system.dart';
+import 'package:front_end/src/api_prototype/compiler_options.dart';
+import 'package:front_end/src/api_prototype/file_system.dart';
 import 'package:front_end/src/base/processed_options.dart';
 import 'package:front_end/src/fasta/fasta_codes.dart';
 import 'package:kernel/ast.dart' show Source;

pkg/front_end/lib/src/fasta/get_dependencies.dart

@@ -10,9 +10,9 @@ import 'package:kernel/kernel.dart' show loadProgramFromBytes;
 
 import 'package:kernel/target/targets.dart' show Target;
 
-import '../../compiler_options.dart' show CompilerOptions;
+import '../api_prototype/compiler_options.dart' show CompilerOptions;
 
-import '../../file_system.dart' show FileSystem;
+import '../api_prototype/file_system.dart' show FileSystem;
 
 import '../base/processed_options.dart' show ProcessedOptions;
 

pkg/front_end/lib/src/fasta/kernel/kernel_target.dart

@@ -42,7 +42,7 @@ import 'package:kernel/ast.dart'
 
 import 'package:kernel/type_algebra.dart' show substitute;
 
-import '../../../file_system.dart' show FileSystem;
+import '../../api_prototype/file_system.dart' show FileSystem;
 
 import '../compiler_context.dart' show CompilerContext;
 

pkg/front_end/lib/src/fasta/source/source_loader.dart

@@ -20,7 +20,7 @@ import 'package:kernel/core_types.dart' show CoreTypes;
 import 'package:kernel/src/incremental_class_hierarchy.dart'
     show IncrementalClassHierarchy;
 
-import '../../../file_system.dart';
+import '../../api_prototype/file_system.dart';
 
 import '../../base/instrumentation.dart' show Instrumentation;
 

pkg/front_end/lib/src/fasta/testing/kernel_chain.dart

@@ -32,7 +32,7 @@ import 'package:kernel/text/ast_to_text.dart' show Printer;
 import 'package:testing/testing.dart'
     show ChainContext, Result, StdioProcess, Step, TestDescription;
 
-import 'package:front_end/front_end.dart';
+import 'package:front_end/src/api_prototype/front_end.dart';
 
 import 'package:front_end/src/base/processed_options.dart'
     show ProcessedOptions;

pkg/front_end/lib/src/fasta/uri_translator.dart

@@ -4,7 +4,7 @@
 
 library fasta.uri_translator;
 
-import 'package:front_end/file_system.dart' show FileSystem;
+import 'package:front_end/src/api_prototype/file_system.dart' show FileSystem;
 
 /// Instances of [UriTranslator] translate absolute URIs into corresponding
 /// file URIs in a [FileSystem]. Translated URIs are typically `file:` URIs,

pkg/front_end/lib/src/incremental/file_state.dart

@@ -8,8 +8,8 @@ import 'dart:typed_data';
 
 import 'package:convert/convert.dart';
 import 'package:crypto/crypto.dart';
-import 'package:front_end/byte_store.dart';
-import 'package:front_end/file_system.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
+import 'package:front_end/src/api_prototype/file_system.dart';
 import 'package:front_end/src/base/api_signature.dart';
 import 'package:front_end/src/base/resolve_relative_uri.dart';
 import 'package:front_end/src/dependency_walker.dart' as graph;

pkg/front_end/lib/src/incremental/kernel_driver.dart

@@ -4,8 +4,8 @@
 
 import 'dart:async';
 
-import 'package:front_end/byte_store.dart';
-import 'package:front_end/file_system.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
+import 'package:front_end/src/api_prototype/file_system.dart';
 import 'package:front_end/src/base/api_signature.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:front_end/src/base/processed_options.dart';

pkg/front_end/lib/src/incremental_kernel_generator_impl.dart

@@ -5,9 +5,9 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:front_end/byte_store.dart';
-import 'package:front_end/file_system.dart';
-import 'package:front_end/incremental_kernel_generator.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
+import 'package:front_end/src/api_prototype/file_system.dart';
+import 'package:front_end/src/api_prototype/incremental_kernel_generator.dart';
 import 'package:front_end/src/base/api_signature.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:front_end/src/base/processed_options.dart';

pkg/front_end/lib/src/kernel_generator_impl.dart

@@ -21,8 +21,9 @@ import 'fasta/kernel/utils.dart';
 import 'fasta/kernel/verifier.dart';
 import 'fasta/uri_translator.dart' show UriTranslator;
 
-/// Implementation for the `package:front_end/kernel_generator.dart` and
-/// `package:front_end/summary_generator.dart` APIs.
+/// Implementation for the
+/// `package:front_end/src/api_prototype/kernel_generator.dart` and
+/// `package:front_end/src/api_prototype/summary_generator.dart` APIs.
 Future<CompilerResult> generateKernel(ProcessedOptions options,
     {bool buildSummary: false,
     bool buildProgram: true,

pkg/front_end/lib/src/minimal_incremental_kernel_generator.dart

@@ -4,8 +4,8 @@
 
 import 'dart:async';
 
-import 'package:front_end/file_system.dart';
-import 'package:front_end/incremental_kernel_generator.dart';
+import 'package:front_end/src/api_prototype/file_system.dart';
+import 'package:front_end/src/api_prototype/incremental_kernel_generator.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:front_end/src/base/processed_options.dart';
 import 'package:front_end/src/fasta/compiler_context.dart';

pkg/front_end/lib/src/multi_root_file_system.dart

@@ -7,7 +7,7 @@ library front_end.src.multi_roots_file_system;
 
 import 'dart:async';
 
-import 'package:front_end/file_system.dart';
+import 'package:front_end/src/api_prototype/file_system.dart';
 
 /// Wraps a file system to create an overlay of files from multiple roots.
 ///

pkg/front_end/lib/src/testing/compiler_common.dart

@@ -9,8 +9,8 @@ import 'dart:async';
 
 import 'dart:io' show Platform;
 
-import 'package:front_end/front_end.dart';
-import 'package:front_end/memory_file_system.dart';
+import 'package:front_end/src/api_prototype/front_end.dart';
+import 'package:front_end/src/api_prototype/memory_file_system.dart';
 import 'package:front_end/src/testing/hybrid_file_system.dart';
 import 'package:kernel/ast.dart';
 

pkg/front_end/lib/src/testing/hybrid_file_system.dart

@@ -8,9 +8,9 @@ library front_end.src.hybrid_file_system;
 
 import 'dart:async';
 
-import 'package:front_end/file_system.dart';
-import 'package:front_end/memory_file_system.dart';
-import 'package:front_end/physical_file_system.dart';
+import 'package:front_end/src/api_prototype/file_system.dart';
+import 'package:front_end/src/api_prototype/memory_file_system.dart';
+import 'package:front_end/src/api_prototype/physical_file_system.dart';
 
 /// A file system that mixes files from memory and a physical file system. All
 /// memory entities take priotity over file system entities.

pkg/front_end/test/dependency_grapher_test.dart

@@ -4,9 +4,9 @@
 
 import 'dart:async';
 
-import 'package:front_end/compiler_options.dart';
-import 'package:front_end/dependency_grapher.dart';
-import 'package:front_end/memory_file_system.dart';
+import 'package:front_end/src/api_prototype/compiler_options.dart';
+import 'package:front_end/src/api_prototype/dependency_grapher.dart';
+import 'package:front_end/src/api_prototype/memory_file_system.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 

pkg/front_end/test/fasta/reexport_test.dart

@@ -6,7 +6,8 @@ import "package:async_helper/async_helper.dart" show asyncTest;
 
 import "package:front_end/src/testing/compiler_common.dart" show compileUnit;
 
-import "package:front_end/front_end.dart" show CompilerOptions;
+import "package:front_end/src/api_prototype/front_end.dart"
+    show CompilerOptions;
 
 main() {
   asyncTest(() async {

pkg/front_end/test/fasta/shaker_test.dart

@@ -20,7 +20,7 @@ import 'dart:convert' show JSON;
 import 'dart:io' show File;
 
 export 'package:testing/testing.dart' show Chain, runMe;
-import 'package:front_end/compiler_options.dart';
+import 'package:front_end/src/api_prototype/compiler_options.dart';
 import 'package:front_end/src/base/processed_options.dart';
 import 'package:front_end/src/compute_platform_binaries_location.dart';
 import 'package:front_end/src/fasta/compiler_context.dart';

pkg/front_end/test/fasta/testing/analyzer_loader.dart

@@ -4,7 +4,7 @@
 
 library fasta.analyzer_loader;
 
-import 'package:front_end/physical_file_system.dart';
+import 'package:front_end/src/api_prototype/physical_file_system.dart';
 import 'package:kernel/ast.dart' show Program;
 
 import 'package:front_end/src/fasta/builder/builder.dart' show LibraryBuilder;

pkg/front_end/test/fasta/testing/analyzer_target.dart

@@ -4,7 +4,7 @@
 
 library fasta.analyzer_target;
 
-import 'package:front_end/physical_file_system.dart';
+import 'package:front_end/src/api_prototype/physical_file_system.dart';
 import 'package:kernel/ast.dart' show Library, Source;
 
 import 'package:front_end/src/fasta/kernel/kernel_target.dart'

pkg/front_end/test/fasta/testing/suite.dart

@@ -10,7 +10,8 @@ import 'dart:io' show File, Platform;
 
 import 'dart:convert' show JSON;
 
-import 'package:front_end/physical_file_system.dart' show PhysicalFileSystem;
+import 'package:front_end/src/api_prototype/physical_file_system.dart'
+    show PhysicalFileSystem;
 
 import 'package:front_end/src/base/libraries_specification.dart'
     show TargetLibrariesSpecification;
@@ -33,7 +34,8 @@ import 'package:testing/testing.dart'
         TestDescription,
         StdioProcess;
 
-import 'package:front_end/compiler_options.dart' show CompilerOptions;
+import 'package:front_end/src/api_prototype/compiler_options.dart'
+    show CompilerOptions;
 
 import 'package:front_end/src/base/processed_options.dart'
     show ProcessedOptions;

pkg/front_end/test/incremental_kernel_generator_test.dart

@@ -4,13 +4,13 @@
 
 import 'dart:async';
 
-import 'package:front_end/byte_store.dart';
-import 'package:front_end/compiler_options.dart';
-import 'package:front_end/incremental_kernel_generator.dart';
-import 'package:front_end/memory_file_system.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
+import 'package:front_end/src/api_prototype/compiler_options.dart';
+import 'package:front_end/src/api_prototype/incremental_kernel_generator.dart';
+import 'package:front_end/src/api_prototype/memory_file_system.dart';
 import 'package:front_end/src/fasta/kernel/utils.dart';
 import 'package:front_end/src/incremental_kernel_generator_impl.dart';
-import 'package:front_end/summary_generator.dart';
+import 'package:front_end/src/api_prototype/summary_generator.dart';
 import 'package:kernel/ast.dart';
 import 'package:kernel/text/ast_to_text.dart';
 import 'package:test/test.dart';

pkg/front_end/test/kernel_generator_test.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:front_end/front_end.dart';
+import 'package:front_end/src/api_prototype/front_end.dart';
 import 'package:front_end/src/fasta/fasta_codes.dart';
 import 'package:front_end/src/fasta/kernel/utils.dart';
 import 'package:front_end/src/fasta/deprecated_problems.dart'

pkg/front_end/test/memory_file_system_test.dart

@@ -8,8 +8,9 @@ library front_end.test.memory_file_system_test;
 import 'dart:convert';
 import 'dart:io' as io;
 
-import 'package:front_end/file_system.dart' show FileSystemException;
-import 'package:front_end/memory_file_system.dart';
+import 'package:front_end/src/api_prototype/file_system.dart'
+    show FileSystemException;
+import 'package:front_end/src/api_prototype/memory_file_system.dart';
 import 'package:path/path.dart' as pathos;
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';

pkg/front_end/test/minimal_incremental_kernel_generator_test.dart

@@ -4,14 +4,14 @@
 
 import 'dart:async';
 
-import 'package:front_end/byte_store.dart';
-import 'package:front_end/compiler_options.dart';
-import 'package:front_end/incremental_kernel_generator.dart';
-import 'package:front_end/memory_file_system.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
+import 'package:front_end/src/api_prototype/compiler_options.dart';
+import 'package:front_end/src/api_prototype/incremental_kernel_generator.dart';
+import 'package:front_end/src/api_prototype/memory_file_system.dart';
 import 'package:front_end/src/fasta/kernel/utils.dart';
 import 'package:front_end/src/incremental_kernel_generator_impl.dart';
 import 'package:front_end/src/minimal_incremental_kernel_generator.dart';
-import 'package:front_end/summary_generator.dart';
+import 'package:front_end/src/api_prototype/summary_generator.dart';
 import 'package:kernel/ast.dart';
 import 'package:kernel/text/ast_to_text.dart';
 import 'package:test/test.dart';

pkg/front_end/test/mixin_export_test.dart

@@ -5,7 +5,7 @@
 import 'package:async_helper/async_helper.dart' show asyncTest;
 
 import 'package:front_end/src/testing/compiler_common.dart';
-import 'package:front_end/front_end.dart';
+import 'package:front_end/src/api_prototype/front_end.dart';
 
 main() {
   asyncTest(() async {

pkg/front_end/test/physical_file_system_test.dart

@@ -9,8 +9,8 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io' as io;
 
-import 'package:front_end/file_system.dart';
-import 'package:front_end/physical_file_system.dart';
+import 'package:front_end/src/api_prototype/file_system.dart';
+import 'package:front_end/src/api_prototype/physical_file_system.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';

pkg/front_end/test/src/base/processed_options_test.dart

@@ -4,8 +4,8 @@
 
 import 'dart:async';
 
-import 'package:front_end/compiler_options.dart';
-import 'package:front_end/memory_file_system.dart';
+import 'package:front_end/src/api_prototype/compiler_options.dart';
+import 'package:front_end/src/api_prototype/memory_file_system.dart';
 import 'package:front_end/src/base/processed_options.dart';
 import 'package:front_end/src/fasta/compiler_context.dart';
 import 'package:front_end/src/fasta/util/bytes_sink.dart' show BytesSink;

pkg/front_end/test/src/incremental/file_state_test.dart

@@ -4,8 +4,8 @@
 
 import 'dart:async';
 
-import 'package:front_end/byte_store.dart';
-import 'package:front_end/memory_file_system.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
+import 'package:front_end/src/api_prototype/memory_file_system.dart';
 import 'package:front_end/src/fasta/uri_translator_impl.dart';
 import 'package:front_end/src/incremental/file_state.dart';
 import 'package:kernel/target/targets.dart';

pkg/front_end/test/src/incremental/hot_reload_e2e_test.dart

@@ -11,11 +11,11 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:front_end/byte_store.dart';
-import 'package:front_end/compiler_options.dart';
-import 'package:front_end/file_system.dart';
-import 'package:front_end/incremental_kernel_generator.dart';
-import 'package:front_end/memory_file_system.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
+import 'package:front_end/src/api_prototype/compiler_options.dart';
+import 'package:front_end/src/api_prototype/file_system.dart';
+import 'package:front_end/src/api_prototype/incremental_kernel_generator.dart';
+import 'package:front_end/src/api_prototype/memory_file_system.dart';
 import 'package:front_end/src/testing/hybrid_file_system.dart';
 import 'package:kernel/ast.dart';
 import 'package:kernel/binary/limited_ast_to_binary.dart';

pkg/front_end/test/src/incremental/kernel_driver_test.dart

@@ -4,15 +4,15 @@
 
 import 'dart:async';
 
-import 'package:front_end/byte_store.dart';
-import 'package:front_end/compiler_options.dart';
-import 'package:front_end/memory_file_system.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
+import 'package:front_end/src/api_prototype/compiler_options.dart';
+import 'package:front_end/src/api_prototype/memory_file_system.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:front_end/src/base/processed_options.dart';
 import 'package:front_end/src/fasta/kernel/utils.dart';
 import 'package:front_end/src/fasta/uri_translator_impl.dart';
 import 'package:front_end/src/incremental/kernel_driver.dart';
-import 'package:front_end/summary_generator.dart';
+import 'package:front_end/src/api_prototype/summary_generator.dart';
 import 'package:kernel/ast.dart';
 import 'package:kernel/binary/ast_from_binary.dart';
 import 'package:kernel/target/targets.dart';

pkg/front_end/test/src/incremental/mock_sdk.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:front_end/memory_file_system.dart';
+import 'package:front_end/src/api_prototype/memory_file_system.dart';
 import 'package:front_end/src/base/libraries_specification.dart';
 
 final _ASYNC = r'''

pkg/front_end/test/src/multi_root_file_system_test.dart

@@ -6,7 +6,7 @@ library front_end.test.src.multi_root_file_system.dart;
 
 import 'dart:async';
 
-import 'package:front_end/memory_file_system.dart';
+import 'package:front_end/src/api_prototype/memory_file_system.dart';
 import 'package:front_end/src/multi_root_file_system.dart';
 
 import 'package:test/test.dart';

pkg/front_end/test/subpackage_relationships_test.dart

@@ -5,8 +5,8 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:front_end/compiler_options.dart';
-import 'package:front_end/dependency_grapher.dart';
+import 'package:front_end/src/api_prototype/compiler_options.dart';
+import 'package:front_end/src/api_prototype/dependency_grapher.dart';
 import 'package:front_end/src/testing/package_root.dart' as package_root;
 import 'package:path/path.dart' as pathos;
 
@@ -39,14 +39,8 @@ final allowedPackageDependencies = [
 /// TODO(paulberry): stuff in lib/src shouldn't depend on lib; lib should just
 /// re-export stuff in lib/src.
 final subpackageRules = {
-  'lib': new SubpackageRules(allowedDependencies: [
-    'lib/src',
-    'lib/src/base',
-    'lib/src/byte_store',
-    'lib/src/fasta',
-  ]),
   'lib/src': new SubpackageRules(allowedDependencies: [
-    'lib',
+    'lib/src/api_prototype',
     'lib/src/base',
     'lib/src/fasta',
     "lib/src/fasta/dill",
@@ -54,9 +48,15 @@ final subpackageRules = {
     'lib/src/fasta/source',
     'lib/src/incremental',
   ]),
-  'lib/src/base': new SubpackageRules(allowedDependencies: [
-    'lib',
+  'lib/src/api_prototype': new SubpackageRules(allowedDependencies: [
     'lib/src',
+    'lib/src/base',
+    'lib/src/byte_store',
+    'lib/src/fasta',
+  ]),
+  'lib/src/base': new SubpackageRules(allowedDependencies: [
+    'lib/src',
+    'lib/src/api_prototype',
     'lib/src/fasta',
     'lib/src/fasta/util',
   ]),
@@ -65,7 +65,7 @@ final subpackageRules = {
   'lib/src/byte_store': new SubpackageRules(allowedDependencies: []),
   'lib/src/codegen': new SubpackageRules(),
   'lib/src/fasta': new SubpackageRules(allowedDependencies: [
-    'lib',
+    'lib/src/api_prototype',
     'lib/src/base',
     'lib/src/fasta/builder',
     'lib/src/fasta/dill',
@@ -87,7 +87,7 @@ final subpackageRules = {
     'lib/src/fasta/kernel',
   ]),
   'lib/src/fasta/kernel': new SubpackageRules(allowedDependencies: [
-    'lib',
+    'lib/src/api_prototype',
     'lib/src/fasta',
     'lib/src/base',
     'lib/src/fasta/builder',
@@ -112,7 +112,7 @@ final subpackageRules = {
     'lib/src/fasta/util',
   ]),
   'lib/src/fasta/source': new SubpackageRules(allowedDependencies: [
-    'lib',
+    'lib/src/api_prototype',
     'lib/src/fasta',
     'lib/src/base',
     'lib/src/fasta/builder',
@@ -123,7 +123,7 @@ final subpackageRules = {
     'lib/src/scanner',
   ]),
   'lib/src/fasta/testing': new SubpackageRules(allowedDependencies: [
-    'lib',
+    'lib/src/api_prototype',
     'lib/src',
     'lib/src/base',
     'lib/src/fasta',
@@ -139,7 +139,7 @@ final subpackageRules = {
   ]),
   'lib/src/fasta/util': new SubpackageRules(),
   'lib/src/incremental': new SubpackageRules(allowedDependencies: [
-    'lib',
+    'lib/src/api_prototype',
     'lib/src',
     'lib/src/base',
     'lib/src/fasta',
@@ -157,7 +157,7 @@ final subpackageRules = {
     'lib/src/fasta/scanner',
   ]),
   'lib/src/testing': new SubpackageRules(allowedDependencies: [
-    'lib',
+    'lib/src/api_prototype',
   ]),
 };
 

pkg/front_end/test/summary_generator_test.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:front_end/front_end.dart';
+import 'package:front_end/src/api_prototype/front_end.dart';
 import 'package:front_end/src/testing/compiler_common.dart';
 import 'package:kernel/ast.dart';
 import 'package:kernel/kernel.dart';

pkg/front_end/tool/_fasta/bulk_compile.dart

@@ -6,12 +6,14 @@ import 'dart:async' show Future;
 
 import 'dart:convert' show UTF8;
 
-import 'package:front_end/compiler_options.dart' show CompilerOptions;
+import 'package:front_end/src/api_prototype/compiler_options.dart'
+    show CompilerOptions;
 
-import 'package:front_end/file_system.dart'
+import 'package:front_end/src/api_prototype/file_system.dart'
     show FileSystem, FileSystemEntity, FileSystemException;
 
-import 'package:front_end/physical_file_system.dart' show PhysicalFileSystem;
+import 'package:front_end/src/api_prototype/physical_file_system.dart'
+    show PhysicalFileSystem;
 
 import 'package:front_end/src/base/processed_options.dart'
     show ProcessedOptions;

pkg/front_end/tool/_fasta/bulk_compile_test.dart

@@ -4,7 +4,8 @@
 
 import 'dart:isolate' show ReceivePort;
 
-import 'package:front_end/compiler_options.dart' show CompilerOptions;
+import 'package:front_end/src/api_prototype/compiler_options.dart'
+    show CompilerOptions;
 
 import 'bulk_compile.dart' show BulkCompiler;
 

pkg/front_end/tool/_fasta/command_line.dart

@@ -6,7 +6,8 @@ library fasta.tool.command_line;
 
 import 'dart:io' show exit;
 
-import 'package:front_end/compiler_options.dart' show CompilerOptions;
+import 'package:front_end/src/api_prototype/compiler_options.dart'
+    show CompilerOptions;
 
 import 'package:front_end/src/base/processed_options.dart'
     show ProcessedOptions;

pkg/front_end/tool/bazel/worker.dart

@@ -6,7 +6,8 @@ import 'dart:io';
 
 import 'package:args/args.dart';
 import 'package:bazel_worker/bazel_worker.dart';
-import 'package:front_end/front_end.dart' hide FileSystemException;
+import 'package:front_end/src/api_prototype/front_end.dart'
+    hide FileSystemException;
 import 'package:front_end/src/fasta/command_line_reporting.dart';
 import 'package:kernel/target/targets.dart';
 

pkg/front_end/tool/example.dart

@@ -4,8 +4,8 @@
 
 import 'dart:async';
 
-import 'package:front_end/kernel_generator.dart';
-import 'package:front_end/compiler_options.dart';
+import 'package:front_end/src/api_prototype/kernel_generator.dart';
+import 'package:front_end/src/api_prototype/compiler_options.dart';
 import 'package:kernel/binary/ast_to_binary.dart';
 import 'package:kernel/kernel.dart' show Program;
 

pkg/front_end/tool/fasta_perf.dart

@@ -11,7 +11,7 @@ import 'dart:io';
 import 'package:analyzer/src/fasta/ast_builder.dart';
 import 'package:args/args.dart';
 
-import 'package:front_end/front_end.dart';
+import 'package:front_end/src/api_prototype/front_end.dart';
 import 'package:front_end/src/base/processed_options.dart';
 import 'package:front_end/src/fasta/parser.dart';
 import 'package:front_end/src/fasta/scanner.dart';

pkg/front_end/tool/fasta_perf_test.dart

@@ -14,7 +14,8 @@ main() async {
     'scan',
     'kernel_gen_e2e',
   ];
-  var inputFile = Platform.script.resolve('../lib/file_system.dart').path;
+  var inputFile =
+      Platform.script.resolve('../lib/src/api_prototype/file_system.dart').path;
   for (var id in benchIds) {
     print('=== legacy for $id $inputFile');
     await m.main(['--legacy', id, inputFile]);

pkg/front_end/tool/incremental_perf.dart

@@ -47,12 +47,13 @@ import 'dart:convert';
 import 'dart:io' hide FileSystemEntity;
 
 import 'package:args/args.dart';
-import 'package:front_end/byte_store.dart';
-import 'package:front_end/file_system.dart' show FileSystemEntity;
-import 'package:front_end/front_end.dart';
-import 'package:front_end/incremental_kernel_generator.dart';
-import 'package:front_end/memory_file_system.dart';
-import 'package:front_end/physical_file_system.dart';
+import 'package:front_end/src/api_prototype/byte_store.dart';
+import 'package:front_end/src/api_prototype/file_system.dart'
+    show FileSystemEntity;
+import 'package:front_end/src/api_prototype/front_end.dart';
+import 'package:front_end/src/api_prototype/incremental_kernel_generator.dart';
+import 'package:front_end/src/api_prototype/memory_file_system.dart';
+import 'package:front_end/src/api_prototype/physical_file_system.dart';
 import 'package:front_end/src/base/processed_options.dart';
 import 'package:front_end/src/byte_store/protected_file_byte_store.dart';
 import 'package:front_end/src/fasta/uri_translator.dart';

pkg/front_end/tool/perf_common.dart

@@ -7,7 +7,7 @@ library front_end.tool.perf_common;
 
 import 'dart:io';
 
-import 'package:front_end/front_end.dart';
+import 'package:front_end/src/api_prototype/front_end.dart';
 import 'package:front_end/src/fasta/fasta_codes.dart';
 
 /// Error messages that we temporarily allow when compiling benchmarks in strong

pkg/front_end/tool/perf_test.dart

@@ -9,7 +9,8 @@ import 'perf.dart' as m;
 
 main() async {
   var benchIds = ['scan', 'parse', 'linked_summarize'];
-  var inputFile = Platform.script.resolve('../lib/file_system.dart').path;
+  var inputFile =
+      Platform.script.resolve('../lib/src/api_prototype/file_system.dart').path;
   for (var id in benchIds) {
     await m.main([id, inputFile]);
   }

pkg/vm/bin/kernel_service.dart

@@ -25,11 +25,11 @@ import 'dart:io' show Platform hide FileSystemEntity;
 import 'dart:isolate';
 import 'dart:typed_data' show Uint8List;
 
-import 'package:front_end/file_system.dart';
-import 'package:front_end/front_end.dart';
-import 'package:front_end/incremental_kernel_generator.dart';
-import 'package:front_end/memory_file_system.dart';
-import 'package:front_end/physical_file_system.dart';
+import 'package:front_end/src/api_prototype/file_system.dart';
+import 'package:front_end/src/api_prototype/front_end.dart';
+import 'package:front_end/src/api_prototype/incremental_kernel_generator.dart';
+import 'package:front_end/src/api_prototype/memory_file_system.dart';
+import 'package:front_end/src/api_prototype/physical_file_system.dart';
 import 'package:front_end/src/compute_platform_binaries_location.dart'
     show computePlatformBinariesLocation;
 import 'package:front_end/src/fasta/kernel/utils.dart';

pkg/vm/lib/kernel_front_end.dart

@@ -7,8 +7,9 @@ library vm.kernel_front_end;
 
 import 'dart:async';
 
-import 'package:front_end/compiler_options.dart';
-import 'package:front_end/kernel_generator.dart' show kernelForProgram;
+import 'package:front_end/src/api_prototype/compiler_options.dart';
+import 'package:front_end/src/api_prototype/kernel_generator.dart'
+    show kernelForProgram;
 import 'package:kernel/ast.dart' show Program;
 import 'package:kernel/core_types.dart' show CoreTypes;
 

tests/compiler/dart2js/dill_loader_test.dart

@@ -15,7 +15,7 @@ import 'package:compiler/src/library_loader.dart' show ScriptLoader;
 import 'package:compiler/src/script.dart' show Script;
 import 'package:compiler/src/apiimpl.dart' show CompilerImpl;
 import "package:expect/expect.dart";
-import 'package:front_end/front_end.dart';
+import 'package:front_end/src/api_prototype/front_end.dart';
 import 'package:front_end/src/fasta/kernel/utils.dart' show serializeProgram;
 import 'package:compiler/src/kernel/dart2js_target.dart';
 import 'package:kernel/target/targets.dart' show TargetFlags;

tools/patch_sdk.dart

@@ -16,7 +16,7 @@ import 'package:analyzer/analyzer.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:path/path.dart' as path;
 
-import 'package:front_end/front_end.dart';
+import 'package:front_end/src/api_prototype/front_end.dart';
 
 import 'package:front_end/src/base/processed_options.dart';
 import 'package:front_end/src/kernel_generator_impl.dart';