| Index: device/serial/data_sink_receiver.h | 
| diff --git a/device/serial/data_sink_receiver.h b/device/serial/data_sink_receiver.h | 
| index 7a808ea887dc7f2c253a6a49a96e6831f47dc858..8bb306e0c1bc8460d747afc07e1a538ffd5a02fe 100644 | 
| --- a/device/serial/data_sink_receiver.h | 
| +++ b/device/serial/data_sink_receiver.h | 
| @@ -18,8 +18,7 @@ | 
| namespace device { | 
|  | 
| class DataSinkReceiver : public base::RefCounted<DataSinkReceiver>, | 
| -                         public serial::DataSink, | 
| -                         public mojo::ErrorHandler { | 
| +                         public serial::DataSink { | 
| public: | 
| typedef base::Callback<void(scoped_ptr<ReadOnlyBuffer>)> ReadyCallback; | 
| typedef base::Callback<void(int32_t error)> CancelCallback; | 
| @@ -54,7 +53,7 @@ class DataSinkReceiver : public base::RefCounted<DataSinkReceiver>, | 
| const mojo::Callback<void(uint32_t, int32_t)>& callback) override; | 
| void ClearError() override; | 
|  | 
| -  void OnConnectionError() override; | 
| +  void OnConnectionError(); | 
|  | 
| // Dispatches data to |ready_callback_|. | 
| void RunReadyCallback(); | 
|  |