summaryrefslogtreecommitdiffstats
path: root/content/browser/geolocation
diff options
context:
space:
mode:
Diffstat (limited to 'content/browser/geolocation')
-rw-r--r--content/browser/geolocation/device_data_provider.h4
-rw-r--r--content/browser/geolocation/geolocation_dispatcher_host.cc17
-rw-r--r--content/browser/geolocation/location_arbitrator_impl.cc2
-rw-r--r--content/browser/geolocation/location_arbitrator_impl_unittest.cc4
-rw-r--r--content/browser/geolocation/network_location_request.cc2
-rw-r--r--content/browser/geolocation/wifi_data_provider_linux_unittest.cc51
6 files changed, 43 insertions, 37 deletions
diff --git a/content/browser/geolocation/device_data_provider.h b/content/browser/geolocation/device_data_provider.h
index 431d706..c35e256 100644
--- a/content/browser/geolocation/device_data_provider.h
+++ b/content/browser/geolocation/device_data_provider.h
@@ -253,11 +253,11 @@ class DeviceDataProvider : public base::NonThreadSafe {
DeviceDataProvider() {
DCHECK(factory_function_);
impl_ = (*factory_function_)();
- DCHECK(impl_);
+ DCHECK(impl_.get());
impl_->SetContainer(this);
}
virtual ~DeviceDataProvider() {
- DCHECK(impl_);
+ DCHECK(impl_.get());
impl_->SetContainer(NULL);
}
diff --git a/content/browser/geolocation/geolocation_dispatcher_host.cc b/content/browser/geolocation/geolocation_dispatcher_host.cc
index e718013..53f8e4f 100644
--- a/content/browser/geolocation/geolocation_dispatcher_host.cc
+++ b/content/browser/geolocation/geolocation_dispatcher_host.cc
@@ -143,11 +143,16 @@ void GeolocationDispatcherHostImpl::OnRequestPermission(
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
DVLOG(1) << __FUNCTION__ << " " << render_process_id_ << ":"
<< render_view_id << ":" << bridge_id;
- if (geolocation_permission_context_) {
+ if (geolocation_permission_context_.get()) {
geolocation_permission_context_->RequestGeolocationPermission(
- render_process_id_, render_view_id, bridge_id, requesting_frame,
- base::Bind(&SendGeolocationPermissionResponse, render_process_id_,
- render_view_id, bridge_id));
+ render_process_id_,
+ render_view_id,
+ bridge_id,
+ requesting_frame,
+ base::Bind(&SendGeolocationPermissionResponse,
+ render_process_id_,
+ render_view_id,
+ bridge_id));
} else {
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
@@ -163,8 +168,8 @@ void GeolocationDispatcherHostImpl::OnCancelPermissionRequest(
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
DVLOG(1) << __FUNCTION__ << " " << render_process_id_ << ":"
<< render_view_id << ":" << bridge_id;
- if (geolocation_permission_context_) {
- geolocation_permission_context_->CancelGeolocationPermissionRequest(
+ if (geolocation_permission_context_.get()) {
+ geolocation_permission_context_->CancelGeolocationPermissionRequest(
render_process_id_, render_view_id, bridge_id, requesting_frame);
}
}
diff --git a/content/browser/geolocation/location_arbitrator_impl.cc b/content/browser/geolocation/location_arbitrator_impl.cc
index 4fa19b5..8bc9a60 100644
--- a/content/browser/geolocation/location_arbitrator_impl.cc
+++ b/content/browser/geolocation/location_arbitrator_impl.cc
@@ -127,7 +127,7 @@ AccessTokenStore* GeolocationArbitratorImpl::NewAccessTokenStore() {
}
AccessTokenStore* GeolocationArbitratorImpl::GetAccessTokenStore() {
- if (!access_token_store_)
+ if (!access_token_store_.get())
access_token_store_ = NewAccessTokenStore();
return access_token_store_.get();
}
diff --git a/content/browser/geolocation/location_arbitrator_impl_unittest.cc b/content/browser/geolocation/location_arbitrator_impl_unittest.cc
index 02b1b38..830f964 100644
--- a/content/browser/geolocation/location_arbitrator_impl_unittest.cc
+++ b/content/browser/geolocation/location_arbitrator_impl_unittest.cc
@@ -153,7 +153,7 @@ class GeolocationLocationArbitratorTest : public testing::Test {
};
TEST_F(GeolocationLocationArbitratorTest, CreateDestroy) {
- EXPECT_TRUE(access_token_store_);
+ EXPECT_TRUE(access_token_store_.get());
EXPECT_TRUE(arbitrator_ != NULL);
arbitrator_.reset();
SUCCEED();
@@ -170,7 +170,7 @@ TEST_F(GeolocationLocationArbitratorTest, OnPermissionGranted) {
}
TEST_F(GeolocationLocationArbitratorTest, NormalUsage) {
- ASSERT_TRUE(access_token_store_);
+ ASSERT_TRUE(access_token_store_.get());
ASSERT_TRUE(arbitrator_ != NULL);
EXPECT_FALSE(cell());
diff --git a/content/browser/geolocation/network_location_request.cc b/content/browser/geolocation/network_location_request.cc
index b4aac01..849381c 100644
--- a/content/browser/geolocation/network_location_request.cc
+++ b/content/browser/geolocation/network_location_request.cc
@@ -92,7 +92,7 @@ bool NetworkLocationRequest::MakeRequest(const string16& access_token,
GURL request_url = FormRequestURL(url_);
url_fetcher_.reset(net::URLFetcher::Create(
url_fetcher_id_for_tests, request_url, net::URLFetcher::POST, this));
- url_fetcher_->SetRequestContext(url_context_);
+ url_fetcher_->SetRequestContext(url_context_.get());
std::string upload_data;
FormUploadData(wifi_data, timestamp, access_token, &upload_data);
url_fetcher_->SetUploadData("application/json", upload_data);
diff --git a/content/browser/geolocation/wifi_data_provider_linux_unittest.cc b/content/browser/geolocation/wifi_data_provider_linux_unittest.cc
index 718fb5d..9a1a99d 100644
--- a/content/browser/geolocation/wifi_data_provider_linux_unittest.cc
+++ b/content/browser/geolocation/wifi_data_provider_linux_unittest.cc
@@ -39,12 +39,11 @@ class GeolocationWifiDataProviderLinuxTest : public testing::Test {
// Set an expectation so mock_network_manager_proxy_'s
// CallMethodAndBlock() will use CreateNetworkManagerProxyResponse()
// to return responses.
- EXPECT_CALL(*mock_network_manager_proxy_,
+ EXPECT_CALL(*mock_network_manager_proxy_.get(),
MockCallMethodAndBlock(_, _))
- .WillRepeatedly(Invoke(
- this,
- &GeolocationWifiDataProviderLinuxTest::
- CreateNetworkManagerProxyResponse));
+ .WillRepeatedly(Invoke(this,
+ &GeolocationWifiDataProviderLinuxTest::
+ CreateNetworkManagerProxyResponse));
// Create a mock proxy that behaves as NetworkManager/Devices/0.
mock_device_proxy_ =
@@ -52,11 +51,10 @@ class GeolocationWifiDataProviderLinuxTest : public testing::Test {
mock_bus_.get(),
"org.freedesktop.NetworkManager",
dbus::ObjectPath("/org/freedesktop/NetworkManager/Devices/0"));
- EXPECT_CALL(*mock_device_proxy_,
- MockCallMethodAndBlock(_, _))
+ EXPECT_CALL(*mock_device_proxy_.get(), MockCallMethodAndBlock(_, _))
.WillRepeatedly(Invoke(
- this,
- &GeolocationWifiDataProviderLinuxTest::CreateDeviceProxyResponse));
+ this,
+ &GeolocationWifiDataProviderLinuxTest::CreateDeviceProxyResponse));
// Create a mock proxy that behaves as NetworkManager/AccessPoint/0.
mock_access_point_proxy_ =
@@ -64,34 +62,37 @@ class GeolocationWifiDataProviderLinuxTest : public testing::Test {
mock_bus_.get(),
"org.freedesktop.NetworkManager",
dbus::ObjectPath("/org/freedesktop/NetworkManager/AccessPoint/0"));
- EXPECT_CALL(*mock_access_point_proxy_,
- MockCallMethodAndBlock(_, _))
- .WillRepeatedly(Invoke(
- this,
- &GeolocationWifiDataProviderLinuxTest::
- CreateAccessPointProxyResponse));
+ EXPECT_CALL(*mock_access_point_proxy_.get(), MockCallMethodAndBlock(_, _))
+ .WillRepeatedly(Invoke(this,
+ &GeolocationWifiDataProviderLinuxTest::
+ CreateAccessPointProxyResponse));
// Set an expectation so mock_bus_'s GetObjectProxy() for the given
// service name and the object path will return
// mock_network_manager_proxy_.
- EXPECT_CALL(*mock_bus_, GetObjectProxy(
- "org.freedesktop.NetworkManager",
- dbus::ObjectPath("/org/freedesktop/NetworkManager")))
+ EXPECT_CALL(
+ *mock_bus_.get(),
+ GetObjectProxy("org.freedesktop.NetworkManager",
+ dbus::ObjectPath("/org/freedesktop/NetworkManager")))
.WillOnce(Return(mock_network_manager_proxy_.get()));
// Likewise, set an expectation for mock_device_proxy_.
- EXPECT_CALL(*mock_bus_, GetObjectProxy(
- "org.freedesktop.NetworkManager",
- dbus::ObjectPath("/org/freedesktop/NetworkManager/Devices/0")))
+ EXPECT_CALL(
+ *mock_bus_.get(),
+ GetObjectProxy(
+ "org.freedesktop.NetworkManager",
+ dbus::ObjectPath("/org/freedesktop/NetworkManager/Devices/0")))
.WillOnce(Return(mock_device_proxy_.get()))
.WillOnce(Return(mock_device_proxy_.get()));
// Likewise, set an expectation for mock_access_point_proxy_.
- EXPECT_CALL(*mock_bus_, GetObjectProxy(
- "org.freedesktop.NetworkManager",
- dbus::ObjectPath("/org/freedesktop/NetworkManager/AccessPoint/0")))
+ EXPECT_CALL(
+ *mock_bus_.get(),
+ GetObjectProxy(
+ "org.freedesktop.NetworkManager",
+ dbus::ObjectPath("/org/freedesktop/NetworkManager/AccessPoint/0")))
.WillOnce(Return(mock_access_point_proxy_.get()));
// ShutdownAndBlock() should be called.
- EXPECT_CALL(*mock_bus_, ShutdownAndBlock()).WillOnce(Return());
+ EXPECT_CALL(*mock_bus_.get(), ShutdownAndBlock()).WillOnce(Return());
// Create the wlan API with the mock bus object injected.
wifi_provider_linux_ = new WifiDataProviderLinux;
generated by cgit v1.1 at 2025-05-14 14:50:26 +0000