Remove interface_impl.h and error_handler.h usage from chromium

content/common/mojo/service_registry_impl.h

 // 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.
 
 #ifndef CONTENT_COMMON_MOJO_SERVICE_REGISTRY_IMPL_H_
 #define CONTENT_COMMON_MOJO_SERVICE_REGISTRY_IMPL_H_
 
 #include <map>
 #include <queue>
 #include <string>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/common/service_registry.h"
 #include "mojo/application/public/interfaces/service_provider.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"
 #include "third_party/mojo/src/mojo/public/cpp/system/core.h"
 
 namespace content {
 
 class CONTENT_EXPORT ServiceRegistryImpl
     : public ServiceRegistry,
-      public NON_EXPORTED_BASE(mojo::ServiceProvider),
-      public NON_EXPORTED_BASE(mojo::ErrorHandler) {
+      public NON_EXPORTED_BASE(mojo::ServiceProvider) {
  public:
   ServiceRegistryImpl();
   ~ServiceRegistryImpl() override;
 
   // Binds this ServiceProvider implementation to a message pipe endpoint.
   void Bind(mojo::InterfaceRequest<mojo::ServiceProvider> request);
 
   // Binds to a remote ServiceProvider. This will expose added services to the
   // remote ServiceProvider with the corresponding handle and enable
   // ConnectToRemoteService to provide access to services exposed by the remote
@@ skipping 10 matching lines @@
 
   bool IsBound() const;
 
   base::WeakPtr<ServiceRegistry> GetWeakPtr();
 
  private:
   // mojo::ServiceProvider overrides.
   void ConnectToService(const mojo::String& name,
                         mojo::ScopedMessagePipeHandle client_handle) override;
 
-  // mojo::ErrorHandler overrides.
-  void OnConnectionError() override;
+  void OnConnectionError();
 
   mojo::Binding<mojo::ServiceProvider> binding_;
   mojo::ServiceProviderPtr remote_provider_;
 
   std::map<std::string, base::Callback<void(mojo::ScopedMessagePipeHandle)> >
       service_factories_;
   std::queue<std::pair<std::string, mojo::MessagePipeHandle> >
       pending_connects_;
 
   base::WeakPtrFactory<ServiceRegistry> weak_factory_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_MOJO_SERVICE_REGISTRY_IMPL_H_