Gets rid of LocationProviderBase.

device/geolocation/location_provider_android.h

Index: device/geolocation/location_provider_android.h
diff --git a/device/geolocation/location_provider_android.h b/device/geolocation/location_provider_android.h
index 2bf055845a0293e399bd457166e05c8540e0381d..4fd54b8512e181464c8db907545d9f1d73685c18 100644
--- a/device/geolocation/location_provider_android.h
+++ b/device/geolocation/location_provider_android.h
@@ -7,14 +7,14 @@
 
 #include "base/compiler_specific.h"
 #include "device/geolocation/geoposition.h"
-#include "device/geolocation/location_provider_base.h"
+#include "device/geolocation/location_provider.h"
 
 namespace device {
 class AndroidLocationApiAdapter;
 struct Geoposition;
 
 // Location provider for Android using the platform provider over JNI.
-class LocationProviderAndroid : public LocationProviderBase {
+class LocationProviderAndroid : public LocationProvider {
  public:
   LocationProviderAndroid();
   ~LocationProviderAndroid() override;
@@ -23,6 +23,8 @@ class LocationProviderAndroid : public LocationProviderBase {
   void NotifyNewGeoposition(const Geoposition& position);
 
   // LocationProvider.
+  void SetUpdateCallback(
+      const LocationProviderUpdateCallback& callback) override;
   bool StartProvider(bool high_accuracy) override;
   void StopProvider() override;
   const Geoposition& GetPosition() override;
@@ -30,6 +32,7 @@ class LocationProviderAndroid : public LocationProviderBase {
 
  private:
   Geoposition last_position_;
+  LocationProviderUpdateCallback callback_;
 };
 
 }  // namespace device