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

shell/shell_test_base_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 "shell/shell_test_base.h"
 
 #include "base/bind.h"
 #include "base/i18n/time_formatting.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 53 matching lines @@
 
  private:
   template <typename T>
   void SetAndQuitImpl(T* val, T result) {
     *val = result;
     message_loop()->QuitWhenIdle();
   }
   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;
   ConnectToService(test_app_url(), &service);
 
   bool was_run = false;
   service->Ping(SetAndQuit<bool>(&was_run, true));
   message_loop()->Run();
   EXPECT_TRUE(was_run);
   EXPECT_FALSE(service.encountered_error());
@@ skipping 14 matching lines @@
 
   bool was_run = false;
   test_service->Ping(SetAndQuit<bool>(&was_run, true));
 
   // This will quit because there's nothing running.
   message_loop()->Run();
   EXPECT_FALSE(was_run);
 
   // 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());
   }
 
   test_service.reset();
 }
 
 // Tests that we can connect to a single service within a single app using
 // a network based loader instead of local files.
 // TODO(tim): Disabled because network service leaks NSS at exit, meaning
@@ skipping 21 matching lines @@
 }
 
 // Tests that trying to connect to a service over network fails preoprly
 // if the service doesn't exist.
 // TODO(tim): Disabled because network service leaks NSS at exit, meaning
 // subsequent tests can't init properly.
 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();
   EXPECT_TRUE(test_service.encountered_error());
 
   // TODO(tim): crbug.com/392685.  Calling this explicitly shouldn't be
   // necessary once the shell terminates if the primordial app exits, which
   // we could enforce here by resetting |service|.
   shell_context()->application_manager()->TerminateShellConnections();
   message_loop()->Run();  // Waits for all connections to die.
@@ skipping 122 matching lines @@
   EXPECT_EQ(6U, reports[0].total_requests);
   EXPECT_EQ(TestTimeService::Name_, reports[1].service_name);
   EXPECT_EQ(1U, reports[1].total_requests);
   EXPECT_EQ(TestTimeService::Name_, reports[2].service_name);
   EXPECT_EQ(20U, reports[2].total_requests);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace shell