Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Unified Diff: content/browser/geolocation/location_arbitrator.h

Issue 11412194: Cleanup: MockGeolocationArbitrator for GeolocationProvider tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make suggested changes. Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/geolocation/location_arbitrator.h
diff --git a/content/browser/geolocation/location_arbitrator.h b/content/browser/geolocation/location_arbitrator.h
index 7f21d6d76b8c976d97e91ac7cd4368e16ff3942f..443a6a3dee30f55729773aa56757e0362784f5e5 100644
--- a/content/browser/geolocation/location_arbitrator.h
+++ b/content/browser/geolocation/location_arbitrator.h
@@ -5,101 +5,35 @@
#ifndef CONTENT_BROWSER_GEOLOCATION_LOCATION_ARBITRATOR_H_
#define CONTENT_BROWSER_GEOLOCATION_LOCATION_ARBITRATOR_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/common/content_export.h"
-#include "content/public/browser/access_token_store.h"
-#include "content/public/common/geoposition.h"
-#include "net/url_request/url_request_context_getter.h"
-
-namespace net {
-class URLRequestContextGetter;
-}
namespace content {
-class AccessTokenStore;
-class LocationProviderBase;
+
+struct GeolocationObserverOptions;
// 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 {
- 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();
-
- static GURL DefaultNetworkProviderURL();
+class CONTENT_EXPORT GeolocationArbitrator {
+public:
+ virtual ~GeolocationArbitrator() {};
// See more details in geolocation_provider.
- void StartProviders(const GeolocationObserverOptions& options);
- void StopProviders();
+ virtual void StartProviders(const GeolocationObserverOptions& options) = 0;
+ virtual void StopProviders() = 0;
// 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();
+ virtual void OnPermissionGranted() = 0;
// Returns true if this arbitrator has received at least one call to
// OnPermissionGranted().
- bool HasPermissionBeenGranted() const;
-
- // ListenerInterface
- virtual void LocationUpdateAvailable(LocationProviderBase* provider) OVERRIDE;
-
- protected:
-
- AccessTokenStore* GetAccessTokenStore();
-
- // These functions are useful for injection of dependencies in derived
- // testing classes.
- virtual AccessTokenStore* NewAccessTokenStore();
- virtual LocationProviderBase* NewNetworkLocationProvider(
- AccessTokenStore* access_token_store,
- net::URLRequestContextGetter* context,
- const GURL& url,
- const string16& access_token);
- virtual LocationProviderBase* NewSystemLocationProvider();
- virtual base::Time GetTimeNow() const;
-
- private:
- // Takes ownership of |provider| on entry; it will either be added to
- // |providers_| or deleted on error (e.g. it fails to start).
- void RegisterProvider(LocationProviderBase* provider);
- void OnAccessTokenStoresLoaded(
- AccessTokenStore::AccessTokenSet access_token_store,
- net::URLRequestContextGetter* context_getter);
- void DoStartProviders();
- // Returns true if |new_position| is an improvement over |old_position|.
- // Set |from_same_provider| to true if both the positions came from the same
- // provider.
- bool IsNewPositionBetter(const Geoposition& old_position,
- const Geoposition& new_position,
- bool from_same_provider) const;
-
- scoped_refptr<AccessTokenStore> access_token_store_;
- GeolocationObserver* observer_;
- ScopedVector<LocationProviderBase> providers_;
- GeolocationObserverOptions current_provider_options_;
- // The provider which supplied the current |position_|
- const LocationProviderBase* position_provider_;
- bool is_permission_granted_;
- // The current best estimate of our position.
- Geoposition position_;
-
- DISALLOW_COPY_AND_ASSIGN(GeolocationArbitrator);
+ virtual bool HasPermissionBeenGranted() const = 0;
};
} // namespace content
-#endif // CONTENT_BROWSER_GEOLOCATION_LOCATION_ARBITRATOR_H_
+#endif // CONTENT_BROWSER_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_
« no previous file with comments | « content/browser/geolocation/geolocation_provider_unittest.cc ('k') | content/browser/geolocation/location_arbitrator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698