OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/geolocation/arbitrator_dependency_factory.h" | 5 #include "content/browser/geolocation/arbitrator_dependency_factory.h" |
6 | 6 |
7 #include "chrome/browser/profiles/profile.h" | 7 #include "content/browser/content_browser_client.h" |
8 #include "content/browser/geolocation/access_token_store.h" | 8 #include "content/browser/geolocation/access_token_store.h" |
9 #include "content/browser/geolocation/location_provider.h" | 9 #include "content/browser/geolocation/location_provider.h" |
| 10 #include "content/common/content_client.h" |
10 | 11 |
11 // GeolocationArbitratorDependencyFactory | 12 // GeolocationArbitratorDependencyFactory |
12 GeolocationArbitratorDependencyFactory:: | 13 GeolocationArbitratorDependencyFactory:: |
13 ~GeolocationArbitratorDependencyFactory() { | 14 ~GeolocationArbitratorDependencyFactory() { |
14 } | 15 } |
15 | 16 |
16 // DefaultGeolocationArbitratorDependencyFactory | 17 // DefaultGeolocationArbitratorDependencyFactory |
17 net::URLRequestContextGetter* | 18 net::URLRequestContextGetter* |
18 DefaultGeolocationArbitratorDependencyFactory::GetContextGetter() { | 19 DefaultGeolocationArbitratorDependencyFactory::GetContextGetter() { |
19 return Profile::Deprecated::GetDefaultRequestContext(); | 20 // Deprecated; see http://crbug.com/92363 |
| 21 return content::GetContentClient()->browser()-> |
| 22 GetDefaultRequestContextDeprecatedCrBug64339(); |
20 } | 23 } |
21 | 24 |
22 DefaultGeolocationArbitratorDependencyFactory::GetTimeNow | 25 DefaultGeolocationArbitratorDependencyFactory::GetTimeNow |
23 DefaultGeolocationArbitratorDependencyFactory::GetTimeFunction() { | 26 DefaultGeolocationArbitratorDependencyFactory::GetTimeFunction() { |
24 return base::Time::Now; | 27 return base::Time::Now; |
25 } | 28 } |
26 | 29 |
27 AccessTokenStore* | 30 AccessTokenStore* |
28 DefaultGeolocationArbitratorDependencyFactory::NewAccessTokenStore() { | 31 DefaultGeolocationArbitratorDependencyFactory::NewAccessTokenStore() { |
29 return NewChromePrefsAccessTokenStore(); | 32 return NewChromePrefsAccessTokenStore(); |
30 } | 33 } |
31 | 34 |
32 LocationProviderBase* | 35 LocationProviderBase* |
33 DefaultGeolocationArbitratorDependencyFactory::NewNetworkLocationProvider( | 36 DefaultGeolocationArbitratorDependencyFactory::NewNetworkLocationProvider( |
34 AccessTokenStore* access_token_store, | 37 AccessTokenStore* access_token_store, |
35 net::URLRequestContextGetter* context, | 38 net::URLRequestContextGetter* context, |
36 const GURL& url, | 39 const GURL& url, |
37 const string16& access_token) { | 40 const string16& access_token) { |
38 return ::NewNetworkLocationProvider(access_token_store, context, | 41 return ::NewNetworkLocationProvider(access_token_store, context, |
39 url, access_token); | 42 url, access_token); |
40 } | 43 } |
41 | 44 |
42 LocationProviderBase* | 45 LocationProviderBase* |
43 DefaultGeolocationArbitratorDependencyFactory::NewSystemLocationProvider() { | 46 DefaultGeolocationArbitratorDependencyFactory::NewSystemLocationProvider() { |
44 return ::NewSystemLocationProvider(); | 47 return ::NewSystemLocationProvider(); |
45 } | 48 } |
OLD | NEW |