| Index: content/browser/geolocation/arbitrator_dependency_factory.h
|
| diff --git a/content/browser/geolocation/arbitrator_dependency_factory.h b/content/browser/geolocation/arbitrator_dependency_factory.h
|
| index 2aaf4aa3f3cf70108e518538dcabec83962ae3f6..3d3de986fe9875c00be2458c61a794af70cd6d01 100644
|
| --- a/content/browser/geolocation/arbitrator_dependency_factory.h
|
| +++ b/content/browser/geolocation/arbitrator_dependency_factory.h
|
| @@ -10,7 +10,6 @@
|
| #include "base/string16.h"
|
| #include "content/common/content_export.h"
|
|
|
| -class AccessTokenStore;
|
| class GURL;
|
| class LocationProviderBase;
|
|
|
| @@ -18,6 +17,10 @@ namespace base {
|
| class Time;
|
| }
|
|
|
| +namespace content {
|
| +class AccessTokenStore;
|
| +}
|
| +
|
| namespace net {
|
| class URLRequestContextGetter;
|
| }
|
| @@ -31,9 +34,9 @@ class CONTENT_EXPORT GeolocationArbitratorDependencyFactory
|
| typedef base::Time (*GetTimeNow)();
|
|
|
| virtual GetTimeNow GetTimeFunction() = 0;
|
| - virtual AccessTokenStore* NewAccessTokenStore() = 0;
|
| + virtual content::AccessTokenStore* NewAccessTokenStore() = 0;
|
| virtual LocationProviderBase* NewNetworkLocationProvider(
|
| - AccessTokenStore* access_token_store,
|
| + content::AccessTokenStore* access_token_store,
|
| net::URLRequestContextGetter* context,
|
| const GURL& url,
|
| const string16& access_token) = 0;
|
| @@ -51,9 +54,9 @@ class CONTENT_EXPORT DefaultGeolocationArbitratorDependencyFactory
|
| public:
|
| // GeolocationArbitratorDependencyFactory
|
| virtual GetTimeNow GetTimeFunction() OVERRIDE;
|
| - virtual AccessTokenStore* NewAccessTokenStore() OVERRIDE;
|
| + virtual content::AccessTokenStore* NewAccessTokenStore() OVERRIDE;
|
| virtual LocationProviderBase* NewNetworkLocationProvider(
|
| - AccessTokenStore* access_token_store,
|
| + content::AccessTokenStore* access_token_store,
|
| net::URLRequestContextGetter* context,
|
| const GURL& url,
|
| const string16& access_token) OVERRIDE;
|
|
|