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

extensions/test/data/data_sender_unittest.js

Index: extensions/test/data/data_sender_unittest.js
diff --git a/extensions/test/data/data_sender_unittest.js b/extensions/test/data/data_sender_unittest.js
index 9cd1771108d6c938bbc0a79a5392a8ad8e814c83..0b6a5cfe3c7bad8787c55af4eee10be41dd75849 100644
--- a/extensions/test/data/data_sender_unittest.js
+++ b/extensions/test/data/data_sender_unittest.js
@@ -24,14 +24,17 @@
 // Returns a promise to a newly created DataSender.
 function createSender() {
   return Promise.all([
+    requireAsync('content/public/renderer/service_provider'),
     requireAsync('data_sender'),
-    requireAsync('device/serial/data_sender_test_factory'),
+    requireAsync('device/serial/data_stream.mojom'),
   ]).then(function(modules) {
-    var dataSender = modules[0];
-    var factory = modules[1];
-    var sender = factory.create();
-    return new dataSender.DataSender(sender.sink, sender.client, BUFFER_SIZE,
-                                     FATAL_ERROR);
+    var serviceProvider = modules[0];
+    var dataSender = modules[1];
+    var dataStream = modules[2];
+    return new dataSender.DataSender(
+        serviceProvider.connectToService(dataStream.DataSink.name),
+        BUFFER_SIZE,
+        FATAL_ERROR);
   });
 }