Remove usage of mojo::ErrorHandler from components/

The interface is deprecated.

BUG=None

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

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

10 files changed, 10 insertions, 47 deletions

diff --git a/components/view_manager/client_connection.cc b/components/view_manager/client_connection.cc
index 62aae04..113de0e 100644
--- a/components/view_manager/client_connection.cc
+++ b/components/view_manager/client_connection.cc
@@ -26,14 +26,11 @@ DefaultClientConnection::DefaultClientConnection(
       connection_manager_(connection_manager),
       binding_(service(), service_request.Pass()),
       client_(client.Pass()) {
-  binding_.set_error_handler(this);
+  binding_.set_connection_error_handler(
+      [this]() { connection_manager_->OnConnectionError(this); });
 }
 
 DefaultClientConnection::~DefaultClientConnection() {
 }
 
-void DefaultClientConnection::OnConnectionError() {
-  connection_manager_->OnConnectionError(this);
-}
-
 }  // namespace view_manager
diff --git a/components/view_manager/client_connection.h b/components/view_manager/client_connection.h
index a43e0c8..f35adda 100644
--- a/components/view_manager/client_connection.h
+++ b/components/view_manager/client_connection.h
@@ -8,7 +8,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "components/view_manager/public/interfaces/view_manager.mojom.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h"
 
 namespace view_manager {
 
@@ -36,8 +35,7 @@ class ClientConnection {
 };
 
 // Bindings implementation of ClientConnection.
-class DefaultClientConnection : public ClientConnection,
-                                public mojo::ErrorHandler {
+class DefaultClientConnection : public ClientConnection {
  public:
   DefaultClientConnection(
       scoped_ptr<ViewManagerServiceImpl> service_impl,
@@ -47,9 +45,6 @@ class DefaultClientConnection : public ClientConnection,
   ~DefaultClientConnection() override;
 
  private:
-  // ErrorHandler:
-  void OnConnectionError() override;
-
   ConnectionManager* connection_manager_;
   mojo::Binding<mojo::ViewManagerService> binding_;
   mojo::ViewManagerClientPtr client_;
diff --git a/components/view_manager/gles2/command_buffer_impl.cc b/components/view_manager/gles2/command_buffer_impl.cc
index 059093e..9a2a97b 100644
--- a/components/view_manager/gles2/command_buffer_impl.cc
+++ b/components/view_manager/gles2/command_buffer_impl.cc
@@ -151,7 +151,7 @@ CommandBufferImpl::~CommandBufferImpl() {
 void CommandBufferImpl::BindToRequest(
     mojo::InterfaceRequest<mojo::CommandBuffer> request) {
   binding_.Bind(request.Pass());
-  binding_.set_error_handler(this);
+  binding_.set_connection_error_handler([this]() { OnConnectionError(); });
 }
 
 void CommandBufferImpl::OnConnectionError() {
diff --git a/components/view_manager/gles2/command_buffer_impl.h b/components/view_manager/gles2/command_buffer_impl.h
index ccfc467..2961d94 100644
--- a/components/view_manager/gles2/command_buffer_impl.h
+++ b/components/view_manager/gles2/command_buffer_impl.h
@@ -23,8 +23,7 @@ class CommandBufferImplObserver;
 // so that we can insert sync points without blocking on the GL driver. It
 // forwards most method calls to the CommandBufferDriver, which runs on the
 // same thread as the native viewport.
-class CommandBufferImpl : public mojo::CommandBuffer,
-                          public mojo::ErrorHandler {
+class CommandBufferImpl : public mojo::CommandBuffer {
  public:
   CommandBufferImpl(
       mojo::InterfaceRequest<CommandBuffer> request,
@@ -74,8 +73,7 @@ class CommandBufferImpl : public mojo::CommandBuffer,
   void UpdateVSyncParameters(base::TimeTicks timebase,
                              base::TimeDelta interval);
 
-  // mojo::ErrorHandler:
-  void OnConnectionError() override;
+  void OnConnectionError();
 
   scoped_refptr<gpu::SyncPointManager> sync_point_manager_;
   scoped_refptr<base::SingleThreadTaskRunner> driver_task_runner_;
diff --git a/components/view_manager/public/cpp/lib/view_manager_client_impl.cc b/components/view_manager/public/cpp/lib/view_manager_client_impl.cc
index a2fc4c8..f0e6a4c 100644
--- a/components/view_manager/public/cpp/lib/view_manager_client_impl.cc
+++ b/components/view_manager/public/cpp/lib/view_manager_client_impl.cc
@@ -254,7 +254,7 @@ void ViewManagerClientImpl::OnEmbed(ConnectionSpecificId connection_id,
   if (view_manager_service) {
     DCHECK(!service_);
     service_ = view_manager_service.Pass();
-    service_.set_error_handler(this);
+    service_.set_connection_error_handler([this]() { delete this; });
   }
   connection_id_ = connection_id;
 
@@ -406,12 +406,6 @@ void ViewManagerClientImpl::OnViewFocused(Id focused_view_id) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// OnConnectionError, private:
-void ViewManagerClientImpl::OnConnectionError() {
-  delete this;
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // ViewManagerClientImpl, private:
 
 void ViewManagerClientImpl::OnActionCompleted(bool success) {
diff --git a/components/view_manager/public/cpp/lib/view_manager_client_impl.h b/components/view_manager/public/cpp/lib/view_manager_client_impl.h
index db0bc373..0e76ef8 100644
--- a/components/view_manager/public/cpp/lib/view_manager_client_impl.h
+++ b/components/view_manager/public/cpp/lib/view_manager_client_impl.h
@@ -19,8 +19,7 @@ class ViewManagerTransaction;
 
 // Manages the connection with the View Manager service.
 class ViewManagerClientImpl : public ViewManager,
-                              public ViewManagerClient,
-                              public ErrorHandler {
+                              public ViewManagerClient {
  public:
   ViewManagerClientImpl(ViewManagerDelegate* delegate,
                         Shell* shell,
@@ -123,9 +122,6 @@ class ViewManagerClientImpl : public ViewManager,
                         const Callback<void()>& callback) override;
   void OnViewFocused(Id focused_view_id) override;
 
-  // ErrorHandler implementation.
-  void OnConnectionError() override;
-
   void RootDestroyed(View* root);
 
   void OnActionCompleted(bool success);
diff --git a/components/view_manager/view_manager_app.cc b/components/view_manager/view_manager_app.cc
index 21827ed..6cbed25 100644
--- a/components/view_manager/view_manager_app.cc
+++ b/components/view_manager/view_manager_app.cc
@@ -125,8 +125,4 @@ void ViewManagerApp::Create(
   new gles2::GpuImpl(request.Pass(), gpu_state_);
 }
 
-void ViewManagerApp::OnConnectionError() {
-  app_impl_->Terminate();
-}
-
 }  // namespace view_manager
diff --git a/components/view_manager/view_manager_app.h b/components/view_manager/view_manager_app.h
index afedb3b..672b1e6a 100644
--- a/components/view_manager/view_manager_app.h
+++ b/components/view_manager/view_manager_app.h
@@ -29,7 +29,6 @@ class ConnectionManager;
 
 class ViewManagerApp : public mojo::ApplicationDelegate,
                        public ConnectionManagerDelegate,
-                       public mojo::ErrorHandler,
                        public mojo::InterfaceFactory<mojo::ViewManagerRoot>,
                        public mojo::InterfaceFactory<mojo::Gpu> {
  public:
@@ -65,9 +64,6 @@ class ViewManagerApp : public mojo::ApplicationDelegate,
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<mojo::Gpu> request) override;
 
-  // ErrorHandler (for |wm_internal_| and |wm_internal_client_binding_|).
-  void OnConnectionError() override;
-
   mojo::ApplicationImpl* app_impl_;
   scoped_ptr<ConnectionManager> connection_manager_;
   mojo::TracingImpl tracing_;
diff --git a/components/view_manager/view_manager_root_connection.cc b/components/view_manager/view_manager_root_connection.cc
index 216e367..18e7f29 100644
--- a/components/view_manager/view_manager_root_connection.cc
+++ b/components/view_manager/view_manager_root_connection.cc
@@ -51,7 +51,7 @@ ViewManagerRootConnectionImpl::ViewManagerRootConnectionImpl(
     ConnectionManager* manager)
     : ViewManagerRootConnection(root.Pass(), manager),
       binding_(view_manager_root(), request.Pass()) {
-  binding_.set_error_handler(this);
+  binding_.set_connection_error_handler([this]() { CloseConnection(); });
 
   connection_manager()->AddRoot(this);
   set_view_manager_service(connection_manager()->EmbedAtView(
@@ -63,8 +63,4 @@ ViewManagerRootConnectionImpl::ViewManagerRootConnectionImpl(
 ViewManagerRootConnectionImpl::~ViewManagerRootConnectionImpl() {
 }
 
-void ViewManagerRootConnectionImpl::OnConnectionError() {
-  CloseConnection();
-}
-
 }  // namespace view_manager
diff --git a/components/view_manager/view_manager_root_connection.h b/components/view_manager/view_manager_root_connection.h
index ce95624..4d1d8b3 100644
--- a/components/view_manager/view_manager_root_connection.h
+++ b/components/view_manager/view_manager_root_connection.h
@@ -10,7 +10,6 @@
 #include "components/view_manager/view_manager_root_delegate.h"
 #include "components/view_manager/view_manager_root_impl.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h"
 
 namespace view_manager {
 
@@ -61,8 +60,7 @@ class ViewManagerRootConnection : public ViewManagerRootDelegate {
 };
 
 // Live implementation of ViewManagerRootConnection.
-class ViewManagerRootConnectionImpl : public mojo::ErrorHandler,
-                                      public ViewManagerRootConnection {
+class ViewManagerRootConnectionImpl : public ViewManagerRootConnection {
  public:
   ViewManagerRootConnectionImpl(
       mojo::InterfaceRequest<mojo::ViewManagerRoot> request,
@@ -73,9 +71,6 @@ class ViewManagerRootConnectionImpl : public mojo::ErrorHandler,
  private:
   ~ViewManagerRootConnectionImpl() override;
 
-  // ErrorHandler:
-  void OnConnectionError() override;
-
   mojo::Binding<mojo::ViewManagerRoot> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerRootConnectionImpl);