Remove interface_impl.h and error_handler.h usage from chromium

content/browser/geolocation/geolocation_service_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.
 
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/geolocation/geolocation_provider_impl.h"
 #include "content/common/geolocation_service.mojom.h"
 #include "content/public/common/mojo_geoposition.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"
 
 #ifndef CONTENT_BROWSER_GEOLOCATION_GEOLOCATION_SERVICE_IMPL_H_
 #define CONTENT_BROWSER_GEOLOCATION_GEOLOCATION_SERVICE_IMPL_H_
 
 namespace content {
 
 class GeolocationProvider;
 class GeolocationServiceContext;
 
 // Implements the GeolocationService Mojo interface.
-class GeolocationServiceImpl : public GeolocationService,
-                               public mojo::ErrorHandler {
+class GeolocationServiceImpl : public GeolocationService {
  public:
   // |context| must outlive this object. |update_callback| will be called when
   // location updates are sent, allowing the client to know when the service
   // is being used.
   GeolocationServiceImpl(mojo::InterfaceRequest<GeolocationService> request,
                          GeolocationServiceContext* context,
                          const base::Closure& update_callback);
   ~GeolocationServiceImpl() override;
 
   // Starts listening for updates.
   void StartListeningForUpdates();
 
   // Pauses and resumes sending updates to the client of this instance.
   void PauseUpdates();
   void ResumeUpdates();
 
   // Enables and disables geolocation override.
   void SetOverride(const Geoposition& position);
   void ClearOverride();
 
  private:
   typedef mojo::Callback<void(MojoGeopositionPtr)> PositionCallback;
 
   // GeolocationService:
   void SetHighAccuracy(bool high_accuracy) override;
   void QueryNextPosition(const PositionCallback& callback) override;
 
-  // mojo::ErrorHandler:
-  void OnConnectionError() override;
+  void OnConnectionError();
 
   void OnLocationUpdate(const Geoposition& position);
   void ReportCurrentPosition();
 
   // The binding between this object and the other end of the pipe.
   mojo::Binding<GeolocationService> binding_;
 
   // Owns this object.
   GeolocationServiceContext* context_;
   scoped_ptr<GeolocationProvider::Subscription> geolocation_subscription_;
@@ skipping 16 matching lines @@
   bool high_accuracy_;
 
   bool has_position_to_report_;
 
   DISALLOW_COPY_AND_ASSIGN(GeolocationServiceImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GEOLOCATION_GEOLOCATION_SERVICE_IMPL_H_