Convert //shell/... to use set_connection_error_handler() instead of set_error_handler().

shell/shell_test_base_unittest.cc

Index: shell/shell_test_base_unittest.cc
diff --git a/shell/shell_test_base_unittest.cc b/shell/shell_test_base_unittest.cc
index 03d047df4fc6ea2081fc92638eb15bf0a42dda56..89461c05435e2b13d4e1eecba95713f733ff76b8 100644
--- a/shell/shell_test_base_unittest.cc
+++ b/shell/shell_test_base_unittest.cc
@@ -71,20 +71,6 @@ class ShellTestBaseTest : public ShellTestBase {
   TestTrackedRequestServicePtr request_tracking_;
 };
 
-class QuitMessageLoopErrorHandler : public mojo::ErrorHandler {
- public:
-  QuitMessageLoopErrorHandler() {}
-  ~QuitMessageLoopErrorHandler() override {}
-
-  // |mojo::ErrorHandler| implementation:
-  void OnConnectionError() override {
-    base::MessageLoop::current()->QuitWhenIdle();
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(QuitMessageLoopErrorHandler);
-};
-
 // Tests that we can connect to a single service within a single app.
 TEST_F(ShellTestBaseTest, ConnectBasic) {
   TestServicePtr service;
@@ -119,8 +105,8 @@ TEST_F(ShellTestBaseTest, ConnectInvalidService) {
 
   // It may have quit before an error was processed.
   if (!test_service.encountered_error()) {
-    QuitMessageLoopErrorHandler quitter;
-    test_service.set_error_handler(&quitter);
+    test_service.set_connection_error_handler(
+        []() { base::MessageLoop::current()->QuitWhenIdle(); });
     message_loop()->Run();
     EXPECT_TRUE(test_service.encountered_error());
   }
@@ -162,8 +148,8 @@ TEST_F(ShellTestBaseTest, DISABLED_ConnectInvalidServiceNetwork) {
   TestServicePtr test_service;
   ConnectToService(GURL("http://example.com/non_existent_service"),
                    &test_service);
-  QuitMessageLoopErrorHandler quitter;
-  test_service.set_error_handler(&quitter);
+  test_service.set_connection_error_handler(
+      []() { base::MessageLoop::current()->QuitWhenIdle(); });
   bool was_run = false;
   test_service->Ping(SetAndQuit<bool>(&was_run, true));
   message_loop()->Run();