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

extensions/test/data/data_sender_unittest.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Tests launched by extensions/renderer/api/serial/data_sender_unittest.cc
 
 var test = require('test').binding;
 var unittestBindings = require('test_environment_specific_bindings');
 
 var BUFFER_SIZE = 11;
 var FATAL_ERROR = 2;
 
 function generateData(size, pattern) {
   if (!pattern)
     pattern = 'a';
   var buffer = new ArrayBuffer(size);
   var intView = new Int8Array(buffer);
   for (var i = 0; i < size; i++) {
     intView[i] = pattern.charCodeAt(i % pattern.length);
   }
   return buffer;
 }
 
 // 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);
   });
 }
 
 // Returns a function that sends data to a provided DataSender |sender|,
 // checks that the send completes successfully and returns a promise that will
 // resolve to |sender|.
 function sendAndExpectSuccess(data) {
   return function(sender) {
     return sender.send(data).then(function(bytesSent) {
       test.assertEq(data.byteLength, bytesSent);
@@ skipping 234 matching lines @@
 
   function testSerializeAfterClose() {
     createSender()
         .then(closeSender)
         .then(serializeRoundTrip)
         .then(sendAfterClose)
         .then(test.succeed, test.fail);
   },
 
 ], test.runTests, exports);