Geolocation: extract ContentBrowserClient methods specific to Geolocation into a class

android_webview/browser/aw_content_browser_client.cc

Index: android_webview/browser/aw_content_browser_client.cc
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index a717f12c64fb5fc5c27e16f6ba7352f6236caedc..9176b0babe42ee6dd0e7f62820b5d3b39c3df217 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -160,6 +160,19 @@ class AwAccessTokenStore : public content::AccessTokenStore {
   DISALLOW_COPY_AND_ASSIGN(AwAccessTokenStore);
 };
 
+// A provider of Geolocation services to override AccessTokenStore.
+class AwGeolocationDelegate : public content::GeolocationProvider::Delegate {
+ public:
+  AwGeolocationDelegate() = default;
+
+  content::AccessTokenStore* CreateAccessTokenStore() final {
+    return new AwAccessTokenStore();
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(AwGeolocationDelegate);
+};
+
 AwLocaleManager* g_locale_manager = NULL;
 
 }  // anonymous namespace
@@ -428,8 +441,9 @@ net::NetLog* AwContentBrowserClient::GetNetLog() {
   return browser_context_->GetAwURLRequestContext()->GetNetLog();
 }
 
-content::AccessTokenStore* AwContentBrowserClient::CreateAccessTokenStore() {
-  return new AwAccessTokenStore();
+content::GeolocationProvider::Delegate*
+AwContentBrowserClient::CreateGeolocationDelegate() {
+  return new AwGeolocationDelegate();
 }
 
 bool AwContentBrowserClient::IsFastShutdownPossible() {