diff options
Diffstat (limited to 'content/browser/geolocation')
6 files changed, 17 insertions, 17 deletions
diff --git a/content/browser/geolocation/fake_access_token_store.cc b/content/browser/geolocation/fake_access_token_store.cc index 9e8704a..d7da9ad 100644 --- a/content/browser/geolocation/fake_access_token_store.cc +++ b/content/browser/geolocation/fake_access_token_store.cc @@ -33,11 +33,11 @@ void FakeAccessTokenStore::NotifyDelegateTokensLoaded() { } net::URLRequestContextGetter* context_getter = NULL; - callback_.Run(access_token_set_, context_getter); + callback_.Run(access_token_map_, context_getter); } void FakeAccessTokenStore::DefaultLoadAccessTokens( - const LoadAccessTokensCallbackType& callback) { + const LoadAccessTokensCallback& callback) { originating_task_runner_ = base::ThreadTaskRunnerHandle::Get().get(); callback_ = callback; } @@ -45,7 +45,7 @@ void FakeAccessTokenStore::DefaultLoadAccessTokens( void FakeAccessTokenStore::DefaultSaveAccessToken( const GURL& server_url, const base::string16& access_token) { DCHECK(server_url.is_valid()); - access_token_set_[server_url] = access_token; + access_token_map_[server_url] = access_token; } FakeAccessTokenStore::~FakeAccessTokenStore() {} diff --git a/content/browser/geolocation/fake_access_token_store.h b/content/browser/geolocation/fake_access_token_store.h index b6b674d..49ce4cd 100644 --- a/content/browser/geolocation/fake_access_token_store.h +++ b/content/browser/geolocation/fake_access_token_store.h @@ -22,18 +22,18 @@ class FakeAccessTokenStore : public AccessTokenStore { // AccessTokenStore MOCK_METHOD1(LoadAccessTokens, - void(const LoadAccessTokensCallbackType& callback)); + void(const LoadAccessTokensCallback& callback)); MOCK_METHOD2(SaveAccessToken, void(const GURL& server_url, const base::string16& access_token)); - void DefaultLoadAccessTokens(const LoadAccessTokensCallbackType& callback); + void DefaultLoadAccessTokens(const LoadAccessTokensCallback& callback); void DefaultSaveAccessToken(const GURL& server_url, const base::string16& access_token); - AccessTokenSet access_token_set_; - LoadAccessTokensCallbackType callback_; + AccessTokenMap access_token_map_; + LoadAccessTokensCallback callback_; protected: // Protected instead of private so we can have NiceMocks. diff --git a/content/browser/geolocation/location_arbitrator_impl.cc b/content/browser/geolocation/location_arbitrator_impl.cc index 5053504..e176dfe 100644 --- a/content/browser/geolocation/location_arbitrator_impl.cc +++ b/content/browser/geolocation/location_arbitrator_impl.cc @@ -93,7 +93,7 @@ void LocationArbitratorImpl::StopProviders() { } void LocationArbitratorImpl::OnAccessTokenStoresLoaded( - AccessTokenStore::AccessTokenSet access_token_set, + AccessTokenStore::AccessTokenMap access_token_map, net::URLRequestContextGetter* context_getter) { if (!is_running_ || !providers_.empty()) { // A second StartProviders() call may have arrived before the first @@ -101,9 +101,9 @@ void LocationArbitratorImpl::OnAccessTokenStoresLoaded( return; } // If there are no access tokens, boot strap it with the default server URL. - if (access_token_set.empty()) - access_token_set[DefaultNetworkProviderURL()]; - for (const auto& entry : access_token_set) { + if (access_token_map.empty()) + access_token_map[DefaultNetworkProviderURL()]; + for (const auto& entry : access_token_map) { RegisterProvider(NewNetworkLocationProvider( GetAccessTokenStore(), context_getter, entry.first, entry.second)); } diff --git a/content/browser/geolocation/location_arbitrator_impl.h b/content/browser/geolocation/location_arbitrator_impl.h index 65a5532..87ae11b 100644 --- a/content/browser/geolocation/location_arbitrator_impl.h +++ b/content/browser/geolocation/location_arbitrator_impl.h @@ -69,7 +69,7 @@ class CONTENT_EXPORT LocationArbitratorImpl : public LocationArbitrator { // |providers_| or deleted on error (e.g. it fails to start). void RegisterProvider(LocationProvider* provider); void OnAccessTokenStoresLoaded( - AccessTokenStore::AccessTokenSet access_token_store, + AccessTokenStore::AccessTokenMap access_token_map, net::URLRequestContextGetter* context_getter); void DoStartProviders(); diff --git a/content/browser/geolocation/location_arbitrator_impl_unittest.cc b/content/browser/geolocation/location_arbitrator_impl_unittest.cc index bd5eb6e..0ca94b5 100644 --- a/content/browser/geolocation/location_arbitrator_impl_unittest.cc +++ b/content/browser/geolocation/location_arbitrator_impl_unittest.cc @@ -173,8 +173,8 @@ TEST_F(GeolocationLocationArbitratorTest, NormalUsage) { EXPECT_FALSE(gps()); arbitrator_->StartProviders(false); - EXPECT_TRUE(access_token_store_->access_token_set_.empty()); - EXPECT_TRUE(access_token_store_->access_token_set_.empty()); + EXPECT_TRUE(access_token_store_->access_token_map_.empty()); + EXPECT_TRUE(access_token_store_->access_token_map_.empty()); access_token_store_->NotifyDelegateTokensLoaded(); ASSERT_TRUE(cell()); diff --git a/content/browser/geolocation/network_location_provider_unittest.cc b/content/browser/geolocation/network_location_provider_unittest.cc index 724eb35..0b09a39 100644 --- a/content/browser/geolocation/network_location_provider_unittest.cc +++ b/content/browser/geolocation/network_location_provider_unittest.cc @@ -126,7 +126,7 @@ class GeolocationNetworkProviderTest : public testing::Test { access_token_store_.get(), NULL, // No URLContextGetter needed, as using test urlfecther factory. test_server_url_, - access_token_store_->access_token_set_[test_server_url_]); + access_token_store_->access_token_map_[test_server_url_]); if (set_permission_granted) provider->OnPermissionGranted(); return provider; @@ -415,7 +415,7 @@ TEST_F(GeolocationNetworkProviderTest, MultipleWifiScansComplete) { // Token should be in the store. EXPECT_EQ(base::UTF8ToUTF16(REFERENCE_ACCESS_TOKEN), - access_token_store_->access_token_set_[test_server_url_]); + access_token_store_->access_token_map_[test_server_url_]); // Wifi updated again, with one less AP. This is 'close enough' to the // previous scan, so no new request made. @@ -508,7 +508,7 @@ TEST_F(GeolocationNetworkProviderTest, NetworkRequestDeferredForPermission) { TEST_F(GeolocationNetworkProviderTest, NetworkRequestWithWifiDataDeferredForPermission) { - access_token_store_->access_token_set_[test_server_url_] = + access_token_store_->access_token_map_[test_server_url_] = base::UTF8ToUTF16(REFERENCE_ACCESS_TOKEN); scoped_ptr<LocationProvider> provider(CreateProvider(false)); EXPECT_TRUE(provider->StartProvider(false)); |