Mark FlutterManifest.createFromString() as visible for testing only. (flutter#14276)

tvolkert · web-flow · commit c11f17494659 · 2018-01-26T11:35:38.000-08:00
diff --git a/packages/flutter_tools/lib/src/flutter_manifest.dart b/packages/flutter_tools/lib/src/flutter_manifest.dart
@@ -5,6 +5,7 @@
 import 'dart:async';
 
 import 'package:json_schema/json_schema.dart';
+import 'package:meta/meta.dart';
 import 'package:yaml/yaml.dart';
 
 import 'base/file_system.dart';
@@ -15,11 +16,16 @@ import 'globals.dart';
 class FlutterManifest {
   FlutterManifest._();
 
-  /// Returns null on missing or invalid manifest
+  /// Returns null on invalid manifest. Returns empty manifest on missing file.
   static Future<FlutterManifest> createFromPath(String path) async {
-    return  _createFromYaml(await _loadFlutterManifest(path));
+    if (path == null || !fs.isFileSync(path))
+      return _createFromYaml(null);
+    final String manifest = await fs.file(path).readAsString();
+    return createFromString(manifest);
   }
+
   /// Returns null on missing or invalid manifest
+  @visibleForTesting
   static Future<FlutterManifest> createFromString(String manifest) async {
     return _createFromYaml(loadYaml(manifest));
   }
@@ -145,13 +151,6 @@ class FontAsset {
   String toString() => '$runtimeType(asset: ${assetUri.path}, weight; $weight, style: $style)';
 }
 
-Future<dynamic> _loadFlutterManifest(String manifestPath) async {
-  if (manifestPath == null || !fs.isFileSync(manifestPath))
-    return null;
-  final String manifestDescriptor = await fs.file(manifestPath).readAsString();
-  return loadYaml(manifestDescriptor);
-}
-
 Future<bool> _validate(Object manifest) async {
   final String schemaPath = fs.path.join(
     fs.path.absolute(Cache.flutterRoot), 'packages', 'flutter_tools', 'schema',
