Merge pull request #1986 from abarth/remove_scaffolding

Remove scaffolding for Navigator1 to Navigator2 transition

packages/flutter/lib/src/material/material_app.dart

@@ -31,6 +31,13 @@ AssetBundle _initDefaultBundle() {
 
 final AssetBundle _defaultBundle = _initDefaultBundle();
 
+class RouteArguments {
+  const RouteArguments({ this.context });
+  final BuildContext context;
+}
+typedef Widget RouteBuilder(RouteArguments args);
+typedef RouteBuilder RouteGenerator(String name);
+
 class MaterialApp extends StatefulComponent {
   MaterialApp({
     Key key,

packages/flutter/lib/src/widgets/navigator.dart

@@ -5,15 +5,6 @@
 import 'framework.dart';
 import 'overlay.dart';
 
-// ---------------- Begin scaffolding for Navigator1 to Navigator2 transition
-class RouteArguments {
-  const RouteArguments({ this.context });
-  final BuildContext context;
-}
-typedef Widget RouteBuilder(RouteArguments args);
-typedef RouteBuilder RouteGenerator(String name);
-// ---------------- End scaffolding for Navigator1 to Navigator2 transition
-
 abstract class Route {
   List<OverlayEntry> get overlayEntries;