Revert of Deletes mojo::Callback

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 <memory>
 
 #include "base/macros.h"
 #include "content/browser/geolocation/geolocation_provider_impl.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "third_party/WebKit/public/platform/modules/geolocation/geolocation.mojom.h"
@@ skipping 23 matching lines @@
 
   // 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(blink::mojom::GeopositionPtr)> PositionCallback;
+
   // blink::mojom::GeolocationService:
   void SetHighAccuracy(bool high_accuracy) override;
-  void QueryNextPosition(const QueryNextPositionCallback& callback) override;
+  void QueryNextPosition(const PositionCallback& callback) override;
 
   void OnConnectionError();
 
   void OnLocationUpdate(const Geoposition& position);
   void ReportCurrentPosition();
 
   // The binding between this object and the other end of the pipe.
   mojo::Binding<blink::mojom::GeolocationService> binding_;
 
   // Owns this object.
   GeolocationServiceContext* context_;
   std::unique_ptr<GeolocationProvider::Subscription> geolocation_subscription_;
 
   // Callback that allows the instantiator of this class to be notified on
   // position updates.
   base::Closure update_callback_;
 
   // The callback passed to QueryNextPosition.
-  QueryNextPositionCallback position_callback_;
+  PositionCallback position_callback_;
 
   // Valid iff SetOverride() has been called and ClearOverride() has not
   // subsequently been called.
   Geoposition position_override_;
 
   blink::mojom::Geoposition current_position_;
 
   // Whether this instance is currently observing location updates with high
   // accuracy.
   bool high_accuracy_;
 
   bool has_position_to_report_;
 
   DISALLOW_COPY_AND_ASSIGN(GeolocationServiceImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GEOLOCATION_GEOLOCATION_SERVICE_IMPL_H_