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

extensions/test/data/data_receiver_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_receiver_unittest.cc
 
 var test = require('test').binding;
 var unittestBindings = require('test_environment_specific_bindings');
 
 var BUFFER_SIZE = 10;
 var FATAL_ERROR = 2;
 
 // 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);
   });
 }
 
 // Returns a promise that will resolve to |receiver| when it has received an
 // error from its DataSource.
 function waitForReceiveError(receiver) {
   return new Promise(function(resolve, reject) {
     var onError = receiver.onError;
     receiver.onError = function() {
       $Function.apply(onError, receiver, arguments);
@@ skipping 132 matching lines @@
     }
 
     createReceiver()
         .then(closeReceiver)
         .then(serializeRoundTrip)
         .then(receiveAfterClose)
         .then(test.succeed, test.fail);
   },
 
 ], test.runTests, exports);