Convert all usages of mojo::ErrorHandler in //device/serial to callbacks.

BUG=504666

Review URL: https://codereview.chromium.org/1212023004

Cr-Commit-Position: refs/heads/master@{#337587}

10 files changed, 36 insertions, 30 deletions

diff --git a/device/serial/data_receiver.cc b/device/serial/data_receiver.cc
index 2f238e3..82d0153 100644
--- a/device/serial/data_receiver.cc
+++ b/device/serial/data_receiver.cc
@@ -117,9 +117,11 @@ DataReceiver::DataReceiver(
       fatal_error_value_(fatal_error_value),
       shut_down_(false),
       weak_factory_(this) {
-  source_.set_error_handler(this);
+  source_.set_connection_error_handler(
+      base::Bind(&DataReceiver::OnConnectionError, base::Unretained(this)));
   source_->Init(buffer_size);
-  client_.set_error_handler(this);
+  client_.set_connection_error_handler(
+      base::Bind(&DataReceiver::OnConnectionError, base::Unretained(this)));
 }
 
 bool DataReceiver::Receive(const ReceiveDataCallback& callback,
diff --git a/device/serial/data_receiver.h b/device/serial/data_receiver.h
index 95be640..774d395 100644
--- a/device/serial/data_receiver.h
+++ b/device/serial/data_receiver.h
@@ -19,8 +19,7 @@ namespace device {
 
 // A DataReceiver receives data from a DataSource.
 class DataReceiver : public base::RefCounted<DataReceiver>,
-                     public serial::DataSourceClient,
-                     public mojo::ErrorHandler {
+                     public serial::DataSourceClient {
  public:
   typedef base::Callback<void(scoped_ptr<ReadOnlyBuffer>)> ReceiveDataCallback;
   typedef base::Callback<void(int32_t error)> ReceiveErrorCallback;
@@ -53,8 +52,8 @@ class DataReceiver : public base::RefCounted<DataReceiver>,
   // Invoked by the DataSource transmit data.
   void OnData(mojo::Array<uint8_t> data) override;
 
-  // mojo::ErrorHandler override. Calls ShutDown().
-  void OnConnectionError() override;
+  // mojo error handler
+  void OnConnectionError();
 
   // Invoked by the PendingReceive to report that the user is done with the
   // receive buffer, having read |bytes_read| bytes from it.
diff --git a/device/serial/data_sender.cc b/device/serial/data_sender.cc
index dbd17760..fdf5171 100644
--- a/device/serial/data_sender.cc
+++ b/device/serial/data_sender.cc
@@ -52,7 +52,8 @@ DataSender::DataSender(mojo::InterfacePtr<serial::DataSink> sink,
     : sink_(sink.Pass()),
       fatal_error_value_(fatal_error_value),
       shut_down_(false) {
-  sink_.set_error_handler(this);
+  sink_.set_connection_error_handler(
+      base::Bind(&DataSender::OnConnectionError, base::Unretained(this)));
 }
 
 DataSender::~DataSender() {
diff --git a/device/serial/data_sender.h b/device/serial/data_sender.h
index 93b0644..5c46c35 100644
--- a/device/serial/data_sender.h
+++ b/device/serial/data_sender.h
@@ -17,7 +17,7 @@
 namespace device {
 
 // A DataSender sends data to a DataSink.
-class DataSender : public mojo::ErrorHandler {
+class DataSender {
  public:
   typedef base::Callback<void(uint32_t bytes_sent)> DataSentCallback;
   typedef base::Callback<void(uint32_t bytes_sent, int32_t error)>
@@ -30,7 +30,7 @@ class DataSender : public mojo::ErrorHandler {
              uint32_t buffer_size,
              int32_t fatal_error_value);
 
-  ~DataSender() override;
+  ~DataSender();
 
   // Starts an asynchronous send of |data|. If the send completes successfully,
   // |callback| will be called. Otherwise, |error_callback| will be called with
@@ -55,8 +55,8 @@ class DataSender : public mojo::ErrorHandler {
   // Invoked when a PendingSend fails with |error|.
   void SendFailed(int32_t error);
 
-  // mojo::ErrorHandler override.
-  void OnConnectionError() override;
+  // mojo error handler
+  void OnConnectionError();
 
   // Dispatches a cancel callback if one is pending.
   void RunCancelCallback();
diff --git a/device/serial/data_sink_receiver.cc b/device/serial/data_sink_receiver.cc
index ff66c1c..64ddea1 100644
--- a/device/serial/data_sink_receiver.cc
+++ b/device/serial/data_sink_receiver.cc
@@ -79,7 +79,8 @@ DataSinkReceiver::DataSinkReceiver(
       buffer_in_use_(NULL),
       shut_down_(false),
       weak_factory_(this) {
-  binding_.set_error_handler(this);
+  binding_.set_connection_error_handler(
+      base::Bind(&DataSinkReceiver::OnConnectionError, base::Unretained(this)));
 }
 
 void DataSinkReceiver::ShutDown() {
diff --git a/device/serial/data_sink_receiver.h b/device/serial/data_sink_receiver.h
index 7a808ea..8bb306e 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();
diff --git a/device/serial/data_source_sender.cc b/device/serial/data_source_sender.cc
index 97029dd..5b42992 100644
--- a/device/serial/data_source_sender.cc
+++ b/device/serial/data_source_sender.cc
@@ -85,8 +85,10 @@ DataSourceSender::DataSourceSender(
       shut_down_(false),
       weak_factory_(this) {
   DCHECK(!ready_callback.is_null() && !error_callback.is_null());
-  binding_.set_error_handler(this);
-  client_.set_error_handler(this);
+  binding_.set_connection_error_handler(
+      base::Bind(&DataSourceSender::OnConnectionError, base::Unretained(this)));
+  client_.set_connection_error_handler(
+      base::Bind(&DataSourceSender::OnConnectionError, base::Unretained(this)));
 }
 
 void DataSourceSender::ShutDown() {
diff --git a/device/serial/data_source_sender.h b/device/serial/data_source_sender.h
index a8c2c63..2de7ce6 100644
--- a/device/serial/data_source_sender.h
+++ b/device/serial/data_source_sender.h
@@ -19,8 +19,7 @@ namespace device {
 // A DataSourceSender is an interface between a source of data and a
 // DataSourceClient.
 class DataSourceSender : public base::RefCounted<DataSourceSender>,
-                         public serial::DataSource,
-                         public mojo::ErrorHandler {
+                         public serial::DataSource {
  public:
   typedef base::Callback<void(scoped_ptr<WritableBuffer>)> ReadyCallback;
   typedef base::Callback<void()> ErrorCallback;
@@ -49,8 +48,8 @@ class DataSourceSender : public base::RefCounted<DataSourceSender>,
   void Init(uint32_t buffer_size) override;
   void Resume() override;
   void ReportBytesReceived(uint32_t bytes_sent) override;
-  // Invoked in the event of a connection error. Calls DispatchFatalError().
-  void OnConnectionError() override;
+  // mojo error handler. Calls DispatchFatalError().
+  void OnConnectionError();
 
   // Gets more data to send to the DataSourceClient.
   void GetMoreData();
diff --git a/device/serial/serial_connection_unittest.cc b/device/serial/serial_connection_unittest.cc
index eb0ca27..552bb3a 100644
--- a/device/serial/serial_connection_unittest.cc
+++ b/device/serial/serial_connection_unittest.cc
@@ -16,7 +16,6 @@
 #include "device/serial/serial_service_impl.h"
 #include "device/serial/test_serial_io_handler.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
 
@@ -34,7 +33,7 @@ class FakeSerialDeviceEnumerator : public SerialDeviceEnumerator {
 
 }  // namespace
 
-class SerialConnectionTest : public testing::Test, public mojo::ErrorHandler {
+class SerialConnectionTest : public testing::Test {
  public:
   enum Event {
     EVENT_NONE,
@@ -72,7 +71,8 @@ class SerialConnectionTest : public testing::Test, public mojo::ErrorHandler {
             base::ThreadTaskRunnerHandle::Get()),
         scoped_ptr<SerialDeviceEnumerator>(new FakeSerialDeviceEnumerator),
         mojo::GetProxy(&service));
-    service.set_error_handler(this);
+    service.set_connection_error_handler(base::Bind(
+        &SerialConnectionTest::OnConnectionError, base::Unretained(this)));
     mojo::InterfacePtr<serial::DataSink> sink;
     mojo::InterfacePtr<serial::DataSource> source;
     mojo::InterfacePtr<serial::DataSourceClient> source_client;
@@ -86,7 +86,8 @@ class SerialConnectionTest : public testing::Test, public mojo::ErrorHandler {
     receiver_ =
         new DataReceiver(source.Pass(), source_client_request.Pass(),
                          kBufferSize, serial::RECEIVE_ERROR_DISCONNECTED);
-    connection_.set_error_handler(this);
+    connection_.set_connection_error_handler(base::Bind(
+        &SerialConnectionTest::OnConnectionError, base::Unretained(this)));
     connection_->GetInfo(
         base::Bind(&SerialConnectionTest::StoreInfo, base::Unretained(this)));
     WaitForEvent(EVENT_GOT_INFO);
@@ -169,7 +170,7 @@ class SerialConnectionTest : public testing::Test, public mojo::ErrorHandler {
     EventReceived(EVENT_RECEIVE_ERROR);
   }
 
-  void OnConnectionError() override {
+  void OnConnectionError() {
     EventReceived(EVENT_ERROR);
     FAIL() << "Connection error";
   }
diff --git a/device/serial/serial_service_unittest.cc b/device/serial/serial_service_unittest.cc
index a8f507e..933267d 100644
--- a/device/serial/serial_service_unittest.cc
+++ b/device/serial/serial_service_unittest.cc
@@ -39,7 +39,7 @@ class FailToOpenIoHandler : public TestSerialIoHandler {
 
 }  // namespace
 
-class SerialServiceTest : public testing::Test, public mojo::ErrorHandler {
+class SerialServiceTest : public testing::Test {
  public:
   SerialServiceTest() : connected_(false), expecting_error_(false) {}
 
@@ -48,7 +48,7 @@ class SerialServiceTest : public testing::Test, public mojo::ErrorHandler {
     StopMessageLoop();
   }
 
-  void OnConnectionError() override {
+  void OnConnectionError() {
     StopMessageLoop();
     EXPECT_TRUE(expecting_error_);
   }
@@ -89,7 +89,8 @@ class SerialServiceTest : public testing::Test, public mojo::ErrorHandler {
     service->Connect(path, serial::ConnectionOptions::New(),
                      mojo::GetProxy(&connection), mojo::GetProxy(&sink),
                      mojo::GetProxy(&source), source_client.Pass());
-    connection.set_error_handler(this);
+    connection.set_connection_error_handler(base::Bind(
+        &SerialServiceTest::OnConnectionError, base::Unretained(this)));
     expecting_error_ = !expecting_success;
     connection->GetInfo(
         base::Bind(&SerialServiceTest::OnGotInfo, base::Unretained(this)));
@@ -114,7 +115,8 @@ class SerialServiceTest : public testing::Test, public mojo::ErrorHandler {
 TEST_F(SerialServiceTest, GetDevices) {
   mojo::InterfacePtr<serial::SerialService> service;
   SerialServiceImpl::Create(NULL, NULL, mojo::GetProxy(&service));
-  service.set_error_handler(this);
+  service.set_connection_error_handler(base::Bind(
+      &SerialServiceTest::OnConnectionError, base::Unretained(this)));
   mojo::Array<serial::DeviceInfoPtr> result;
   service->GetDevices(
       base::Bind(&SerialServiceTest::StoreDevices, base::Unretained(this)));