Make fetch.dart and mojo_client.dart share a network service singleton

packages/flutter/lib/src/http/mojo_client.dart

@@ -16,14 +16,6 @@ import 'package:mojo/mojo/http_header.mojom.dart' as mojo;
 
 import 'response.dart';
 
-mojo.NetworkServiceProxy _initNetworkService() {
-  mojo.NetworkServiceProxy networkService = new mojo.NetworkServiceProxy.unbound();
-  shell.connectToService("mojo:authenticated_network_service", networkService);
-  return networkService;
-}
-
-final mojo.NetworkServiceProxy _networkService = _initNetworkService();
-
 /// A `mojo`-based HTTP client
 class MojoClient {
 
@@ -84,12 +76,12 @@ class MojoClient {
       mojo.DataPipeFiller.fillHandle(pipe.producer, data);
     }
     try {
-      _networkService.ptr.createUrlLoader(loader);
+      networkService.ptr.createUrlLoader(loader);
       mojo.UrlResponse response = (await loader.ptr.start(request)).response;
       ByteData data = await mojo.DataPipeDrainer.drainHandle(response.body);
       Uint8List bodyBytes = new Uint8List.view(data.buffer);
-      String body = new String.fromCharCodes(bodyBytes);
-      return new Response(body: body, bodyBytes: bodyBytes, statusCode: response.statusCode);
+      String bodyString = new String.fromCharCodes(bodyBytes);
+      return new Response(body: bodyString, bodyBytes: bodyBytes, statusCode: response.statusCode);
     } catch (e) {
       print("NetworkService unavailable $e");
       return new Response(statusCode: 500);
@@ -105,4 +97,12 @@ class MojoClient {
   }
 
   void close() {}
+
+  static mojo.NetworkServiceProxy _initNetworkService() {
+    mojo.NetworkServiceProxy proxy = new mojo.NetworkServiceProxy.unbound();
+    shell.connectToService("mojo:authenticated_network_service", proxy);
+    return proxy;
+  }
+
+  static final mojo.NetworkServiceProxy networkService = _initNetworkService();
 }

packages/flutter/lib/src/services/asset_bundle.dart

@@ -40,7 +40,9 @@ class NetworkAssetBundle extends AssetBundle {
 
   ImageResource loadImage(String key) => imageCache.load(_urlFromKey(key));
 
-  Future<String> loadString(String key) => http.get(_urlFromKey(key));
+  Future<String> loadString(String key) async {
+    return (await http.get(_urlFromKey(key))).body;
+  }
 }
 
 Future _fetchAndUnpackBundle(String relativeUrl, AssetBundleProxy bundle) async {

packages/flutter/lib/src/services/fetch.dart

@@ -3,30 +3,19 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:typed_data';
 
-import 'package:mojo/core.dart' as core;
 import 'package:mojo/mojo/url_request.mojom.dart';
 import 'package:mojo/mojo/url_response.mojom.dart';
-import 'package:mojo_services/mojo/network_service.mojom.dart';
 import 'package:mojo_services/mojo/url_loader.mojom.dart';
 
-import 'shell.dart';
+import '../http/mojo_client.dart';
 
 export 'package:mojo/mojo/url_response.mojom.dart' show UrlResponse;
 
-NetworkServiceProxy _initNetworkService() {
-  NetworkServiceProxy networkService = new NetworkServiceProxy.unbound();
-  shell.connectToService("mojo:authenticated_network_service", networkService);
-  return networkService;
-}
-
-final NetworkServiceProxy _networkService = _initNetworkService();
-
 Future<UrlResponse> fetch(UrlRequest request) async {
   UrlLoaderProxy loader = new UrlLoaderProxy.unbound();
   try {
-    _networkService.ptr.createUrlLoader(loader);
+    MojoClient.networkService.ptr.createUrlLoader(loader);
     UrlResponse response = (await loader.ptr.start(request)).response;
     return response;
   } catch (e) {