Cleanup: MockGeolocationArbitrator for GeolocationProvider tests

content/browser/geolocation/location_arbitrator_impl.h

Index: content/browser/geolocation/location_arbitrator_impl.h
diff --git a/content/browser/geolocation/location_arbitrator.h b/content/browser/geolocation/location_arbitrator_impl.h
similarity index 73%
copy from content/browser/geolocation/location_arbitrator.h
copy to content/browser/geolocation/location_arbitrator_impl.h
index 7f21d6d76b8c976d97e91ac7cd4368e16ff3942f..e7b4d50f3f558801c4df1743cf969675aa4d8dfc 100644
--- a/content/browser/geolocation/location_arbitrator.h
+++ b/content/browser/geolocation/location_arbitrator_impl.h
@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_GEOLOCATION_LOCATION_ARBITRATOR_H_
-#define CONTENT_BROWSER_GEOLOCATION_LOCATION_ARBITRATOR_H_
+#ifndef CONTENT_BROWSER_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_
+#define CONTENT_BROWSER_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_
 
 #include "base/memory/scoped_vector.h"
 #include "base/string16.h"
 #include "base/time.h"
-#include "content/browser/geolocation/location_provider.h"
 #include "content/browser/geolocation/geolocation_observer.h"
+#include "content/browser/geolocation/location_arbitrator.h"
+#include "content/browser/geolocation/location_provider.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/access_token_store.h"
 #include "content/public/common/geoposition.h"
@@ -26,33 +27,26 @@ class LocationProviderBase;
 // This class is responsible for handling updates from multiple underlying
 // providers and resolving them to a single 'best' location fix at any given
 // moment.
-class CONTENT_EXPORT GeolocationArbitrator
-    : public LocationProviderBase::ListenerInterface {
+class CONTENT_EXPORT GeolocationArbitratorImpl
+    : public GeolocationArbitrator,
+      public LocationProviderBase::ListenerInterface {
  public:
   // Number of milliseconds newer a location provider has to be that it's worth
   // switching to this location provider on the basis of it being fresher
   // (regardles of relative accuracy). Public for tests.
   static const int64 kFixStaleTimeoutMilliseconds;
 
-  explicit GeolocationArbitrator(GeolocationObserver* observer);
-  virtual ~GeolocationArbitrator();
+  explicit GeolocationArbitratorImpl(GeolocationObserver* observer);
+  virtual ~GeolocationArbitratorImpl();
 
   static GURL DefaultNetworkProviderURL();
 
-  // See more details in geolocation_provider.
-  void StartProviders(const GeolocationObserverOptions& options);
-  void StopProviders();
-
-  // Called everytime permission is granted to a page for using geolocation.
-  // This may either be through explicit user action (e.g. responding to the
-  // infobar prompt) or inferred from a persisted site permission.
-  // The arbitrator will inform all providers of this, which may in turn use
-  // this information to modify their internal policy.
-  void OnPermissionGranted();
-
-  // Returns true if this arbitrator has received at least one call to
-  // OnPermissionGranted().
-  bool HasPermissionBeenGranted() const;
+  // GeolocationArbitrator
+  virtual void StartProviders(const GeolocationObserverOptions& options)
+      OVERRIDE;
+  virtual void StopProviders() OVERRIDE;
+  virtual void OnPermissionGranted() OVERRIDE;
+  virtual bool HasPermissionBeenGranted() const OVERRIDE;
 
   // ListenerInterface
   virtual void LocationUpdateAvailable(LocationProviderBase* provider) OVERRIDE;
@@ -97,9 +91,9 @@ class CONTENT_EXPORT GeolocationArbitrator
   // The current best estimate of our position.
   Geoposition position_;
 
-  DISALLOW_COPY_AND_ASSIGN(GeolocationArbitrator);
+  DISALLOW_COPY_AND_ASSIGN(GeolocationArbitratorImpl);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_GEOLOCATION_LOCATION_ARBITRATOR_H_
+#endif  // CONTENT_BROWSER_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_