Rename GeolocationService interface to Geolocation
This interface should not have been named GeolocationService to begin
with. Furthermore, we may have need to create an interface to provide a
Geolocation, which we would want to name GeolocationService.
See also:
https://groups.google.com/a/chromium.org/forum/#!msg/services-dev/udWPNlGLa84/jiO0n_ORAgAJ
BUG=426384
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_site_isolation
Change-Id: If0348820fa3f64d8218efab5b22c1de9f2dcbd76
Reviewed-on: https://chromium-review.googlesource.com/559939
Commit-Queue: Conley Owens <[email protected]>
Reviewed-by: Miguel Casas <[email protected]>
Reviewed-by: Daniel Cheng <[email protected]>
Reviewed-by: Jochen Eisinger <[email protected]>
Reviewed-by: Reilly Grant <[email protected]>
Reviewed-by: Kentaro Hara <[email protected]>
Cr-Commit-Position: refs/heads/master@{#485346}diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 5163e7d..605385a 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -122,7 +122,7 @@
#include "content/public/common/result_codes.h"
#include "content/public/common/url_utils.h"
#include "content/public/common/web_preferences.h"
-#include "device/geolocation/geolocation_service_context.h"
+#include "device/geolocation/geolocation_context.h"
#include "net/base/url_util.h"
#include "net/http/http_cache.h"
#include "net/http/http_transaction_factory.h"
@@ -512,7 +512,7 @@
is_subframe_(false),
force_disable_overscroll_content_(false),
last_dialog_suppressed_(false),
- geolocation_service_context_(new device::GeolocationServiceContext()),
+ geolocation_context_(new device::GeolocationContext()),
accessibility_mode_(
BrowserAccessibilityStateImpl::GetInstance()->accessibility_mode()),
audio_stream_monitor_(this),
@@ -2647,9 +2647,8 @@
return guest->GetMainFrame();
}
-device::GeolocationServiceContext*
-WebContentsImpl::GetGeolocationServiceContext() {
- return geolocation_service_context_.get();
+device::GeolocationContext* WebContentsImpl::GetGeolocationContext() {
+ return geolocation_context_.get();
}
device::mojom::WakeLockContext* WebContentsImpl::GetWakeLockContext() {
