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

device/serial/serial_service_unittest.cc

 // 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.
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "device/serial/serial.mojom.h"
 #include "device/serial/serial_service_impl.h"
 #include "device/serial/test_serial_io_handler.h"
@@ skipping 21 matching lines @@
             const OpenCompleteCallback& callback) override {
     callback.Run(false);
   }
 
  protected:
   ~FailToOpenIoHandler() override {}
 };
 
 }  // namespace
 
-class SerialServiceTest : public testing::Test, public mojo::ErrorHandler {
+class SerialServiceTest : public testing::Test {
  public:
   SerialServiceTest() : connected_(false), expecting_error_(false) {}
 
   void StoreDevices(mojo::Array<serial::DeviceInfoPtr> devices) {
     devices_ = devices.Pass();
     StopMessageLoop();
   }
 
-  void OnConnectionError() override {
+  void OnConnectionError() {
     StopMessageLoop();
     EXPECT_TRUE(expecting_error_);
   }
 
   void RunMessageLoop() {
     run_loop_.reset(new base::RunLoop);
     run_loop_->Run();
   }
 
   void StopMessageLoop() {
@@ skipping 20 matching lines @@
         scoped_ptr<SerialDeviceEnumerator>(new FakeSerialDeviceEnumerator),
         mojo::GetProxy(&service));
     mojo::InterfacePtr<serial::Connection> connection;
     mojo::InterfacePtr<serial::DataSink> sink;
     mojo::InterfacePtr<serial::DataSource> source;
     mojo::InterfacePtr<serial::DataSourceClient> source_client;
     mojo::GetProxy(&source_client);
     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)));
     RunMessageLoop();
     EXPECT_EQ(!expecting_success, connection.encountered_error());
     EXPECT_EQ(expecting_success, connected_);
     connection.reset();
   }
 
   base::MessageLoop message_loop_;
   scoped_ptr<base::RunLoop> run_loop_;
   mojo::Array<serial::DeviceInfoPtr> devices_;
   scoped_refptr<TestSerialIoHandler> io_handler_;
   bool connected_;
   bool expecting_error_;
   serial::ConnectionInfoPtr info_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SerialServiceTest);
 };
 
 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)));
   RunMessageLoop();
 
   // Because we're running on unknown hardware, only check that we received a
   // non-null result.
   EXPECT_TRUE(devices_);
 }
 
 TEST_F(SerialServiceTest, Connect) {
   RunConnectTest("device", true);
 }
 
 TEST_F(SerialServiceTest, ConnectInvalidPath) {
   RunConnectTest("invalid_path", false);
 }
 
 TEST_F(SerialServiceTest, ConnectOpenFailed) {
   io_handler_ = new FailToOpenIoHandler;
   RunConnectTest("device", false);
 }
 
 }  // namespace device