Revert "Tweak public APIs and use them in patch_sdk, dart2js, and kernel-service."

pkg/front_end/test/incremental_kernel_generator_test.dart

Index: pkg/front_end/test/incremental_kernel_generator_test.dart
diff --git a/pkg/front_end/test/incremental_kernel_generator_test.dart b/pkg/front_end/test/incremental_kernel_generator_test.dart
index e51a52a87627e67c171b7e0494db7030802b187c..878a2a4011aebe9c2a27ecf60f54963e30626c54 100644
--- a/pkg/front_end/test/incremental_kernel_generator_test.dart
+++ b/pkg/front_end/test/incremental_kernel_generator_test.dart
@@ -7,11 +7,11 @@ import 'dart:async';
 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/fasta/kernel/utils.dart';
 import 'package:front_end/src/incremental/byte_store.dart';
 import 'package:front_end/src/incremental_kernel_generator_impl.dart';
 import 'package:kernel/ast.dart';
 import 'package:kernel/binary/ast_from_binary.dart';
+import 'package:kernel/binary/limited_ast_to_binary.dart';
 import 'package:kernel/text/ast_to_text.dart';
 import 'package:kernel/verifier.dart';
 import 'package:test/test.dart';
@@ -506,8 +506,11 @@ main() {
       Library initialLibrary = _getLibrary(program, bUri);
       initialKernelText = _getLibraryText(initialLibrary);
 
-      bytes = serializeProgram(program,
-          filter: (library) => library.importUri == bUri);
+      var byteSink = new ByteSink();
+      var printer = new LimitedBinaryPrinter(
+          byteSink, (library) => library.importUri == bUri);
+      printer.writeProgramFile(program);
+      bytes = byteSink.builder.takeBytes();
 
       // Remove b.dart from the program.
       // So, the program is now ready for re-adding the library.