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

shell/application_manager/application_manager_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/at_exit.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/application/application_connection.h"
@@ skipping 28 matching lines @@
   std::string last_test_string;
   int num_impls;
   int num_loader_deletes;
 };
 
 void QuitClosure(bool* value) {
   *value = true;
   base::MessageLoop::current()->QuitWhenIdle();
 }
 
-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);
-};
-
 class TestServiceImpl : public TestService {
  public:
   TestServiceImpl(TestContext* context, InterfaceRequest<TestService> request)
       : context_(context), binding_(this, request.Pass()) {
     ++context_->num_impls;
   }
 
   ~TestServiceImpl() override {
     --context_->num_impls;
     if (!base::MessageLoop::current()->is_running())
@@ skipping 661 matching lines @@
   EXPECT_TRUE(tester_context_.tester_called_quit());
 }
 
 TEST_F(ApplicationManagerTest, NoServiceNoLoad) {
   AddLoaderForURL(GURL(kTestAURLString), std::string());
 
   // There is no TestC service implementation registered with
   // ApplicationManager, so this cannot succeed (but also shouldn't crash).
   TestCPtr c;
   application_manager_->ConnectToService(GURL(kTestAURLString), &c);
-  QuitMessageLoopErrorHandler quitter;
-  c.set_error_handler(&quitter);
+  c.set_connection_error_handler(
+      []() { base::MessageLoop::current()->QuitWhenIdle(); });
 
   loop_.Run();
   EXPECT_TRUE(c.encountered_error());
 }
 
 TEST_F(ApplicationManagerTest, MappedURLsShouldNotCauseDuplicateLoad) {
   test_delegate_.AddMapping(GURL("foo:foo2"), GURL("foo:foo"));
   // 1 because ApplicationManagerTest connects once at startup.
   EXPECT_EQ(1, test_loader_->num_loads());
 
@@ skipping 54 matching lines @@
   bool called = false;
   application_manager_->ConnectToApplication(
       GURL("test:test"), GURL(), nullptr, nullptr,
       base::Bind(&QuitClosure, base::Unretained(&called)));
   loop_.Run();
   EXPECT_TRUE(called);
 }
 
 }  // namespace
 }  // namespace shell