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

extensions/renderer/resources/serial_service.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.
 
 define('serial_service', [
     'content/public/renderer/service_provider',
     'data_receiver',
     'data_sender',
     'device/serial/serial.mojom',
     'device/serial/serial_serialization.mojom',
@@ skipping 116 matching lines @@
     if ('name' in options)
       clientOptions.name = options.name;
     if ('receiveTimeout' in options)
       clientOptions.receiveTimeout = options.receiveTimeout;
     if ('sendTimeout' in options)
       clientOptions.sendTimeout = options.sendTimeout;
     if ('bufferSize' in options)
       clientOptions.bufferSize = options.bufferSize;
   };
 
-  function Connection(connection, router, receivePipe, sendPipe, id, options) {
+  function Connection(connection, router, receivePipe, receiveClientPipe,
+                      sendPipe, id, options) {
     var state = new serialization.ConnectionState();
     state.connectionId = id;
     updateClientOptions(state, options);
     var receiver = new dataReceiver.DataReceiver(
-        receivePipe, state.bufferSize, serialMojom.ReceiveError.DISCONNECTED);
-    var sender = new dataSender.DataSender(
-        sendPipe, state.bufferSize, serialMojom.SendError.DISCONNECTED);
+        receivePipe, receiveClientPipe, state.bufferSize,
+        serialMojom.ReceiveError.DISCONNECTED);
+    var sender = new dataSender.DataSender(sendPipe, state.bufferSize,
+                                           serialMojom.SendError.DISCONNECTED);
     this.init_(state,
                connection,
                router,
                receiver,
                sender,
                null,
                serialMojom.ReceiveError.NONE);
     connections_.set(id, this);
     this.startReceive_();
   }
@@ skipping 26 matching lines @@
     this.sendPipe_ = sender;
     this.sendInProgress_ = false;
   };
 
   Connection.create = function(path, options) {
     options = options || {};
     var serviceOptions = getServiceOptions(options);
     var pipe = core.createMessagePipe();
     var sendPipe = core.createMessagePipe();
     var receivePipe = core.createMessagePipe();
+    var receivePipeClient = core.createMessagePipe();
     service.connect(path,
                     serviceOptions,
                     pipe.handle0,
                     sendPipe.handle0,
-                    receivePipe.handle0);
+                    receivePipe.handle0,
+                    receivePipeClient.handle0);
     var router = new routerModule.Router(pipe.handle1);
     var connection = new serialMojom.Connection.proxyClass(router);
     return connection.getInfo().then(convertServiceInfo).then(function(info) {
       return Promise.all([info, allocateConnectionId()]);
     }).catch(function(e) {
       router.close();
       core.close(sendPipe.handle1);
       core.close(receivePipe.handle1);
+      core.close(receivePipeClient.handle1);
       throw e;
     }).then(function(results) {
       var info = results[0];
       var id = results[1];
       var serialConnectionClient = new Connection(connection,
                                                   router,
                                                   receivePipe.handle1,
+                                                  receivePipeClient.handle1,
                                                   sendPipe.handle1,
                                                   id,
                                                   options);
       var clientInfo = serialConnectionClient.getClientInfo_();
       for (var key in clientInfo) {
         info[key] = clientInfo[key];
       }
       return {
         connection: serialConnectionClient,
         info: info,
@@ skipping 285 matching lines @@
 
   return {
     getDevices: getDevices,
     createConnection: Connection.create,
     getConnection: getConnection,
     getConnections: getConnections,
     // For testing.
     Connection: Connection,
   };
 });