Revert of Remove Client= from device/serial/data_stream.mojom.

extensions/test/data/data_receiver_unittest.js

Index: extensions/test/data/data_receiver_unittest.js
diff --git a/extensions/test/data/data_receiver_unittest.js b/extensions/test/data/data_receiver_unittest.js
index b46189a4631a65f88e86a57d4f436b0e6d61c3d4..75d3ca76f99b882a944b66d4798762c9b05fb06a 100644
--- a/extensions/test/data/data_receiver_unittest.js
+++ b/extensions/test/data/data_receiver_unittest.js
@@ -13,14 +13,17 @@
 // Returns a promise to a newly created DataReceiver.
 function createReceiver() {
   return Promise.all([
+    requireAsync('content/public/renderer/service_provider'),
     requireAsync('data_receiver'),
-    requireAsync('device/serial/data_receiver_test_factory'),
+    requireAsync('device/serial/data_stream.mojom'),
   ]).then(function(modules) {
-    var dataReceiver = modules[0];
-    var factory = modules[1];
-    var receiver = factory.create();
-    return new dataReceiver.DataReceiver(receiver.source, receiver.client,
-                                         BUFFER_SIZE, FATAL_ERROR);
+    var serviceProvider = modules[0];
+    var dataReceiver = modules[1];
+    var dataStream = modules[2];
+    return new dataReceiver.DataReceiver(
+        serviceProvider.connectToService(dataStream.DataSource.name),
+        BUFFER_SIZE,
+        FATAL_ERROR);
   });
 }