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..0e4ab9ac60ac7163c13e0c5368218ce07d19c73b 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -160,6 +160,15 @@ class AwAccessTokenStore : public content::AccessTokenStore {
   DISALLOW_COPY_AND_ASSIGN(AwAccessTokenStore);
 };
 
+// A provider of Geolocation services to override AccessTokenStore.
+class AwGeolocationServiceOverrides
+    : public content::GeolocationProvider::ServiceOverrides {
+ public:
+  AccessTokenStore* CreateAccessTokenStore() override {
+    return new AwAccessTokenStore();
+  }
+};
+
 AwLocaleManager* g_locale_manager = NULL;
 
 }  // anonymous namespace
@@ -428,8 +437,9 @@ net::NetLog* AwContentBrowserClient::GetNetLog() {
   return browser_context_->GetAwURLRequestContext()->GetNetLog();
 }
 
-content::AccessTokenStore* AwContentBrowserClient::CreateAccessTokenStore() {
-  return new AwAccessTokenStore();
+content::GeolocationProvider::ServiceOverrides*
+  AwContentBrowserClient::GetGeolocationServiceOverrides() {
+  return new AwGeolocationServiceOverrides();

[Michael van Ouwerkerk, 2016/06/24 13:57:18]

For a getter, I would expect the client to own the instance, and instantiate it
lazily. Otherwise this method should be called
"CreateGeolocationServiceOverrides" but I wouldn't recommend going in that
direction.

[mcasas, 2016/06/24 19:25:52]

The easiest way code-wise would be to change it to
CreateGeolocationServiceOverride() and hold on to
it inside GeolocationProviderImpl (taking into account
your other comment about not holding on to it inside
LocationArbitratorImpl).  Embedders already create 
instances of AccessTokenStore and/or LocationProvider 
and return them via |new Bla|, so they don't expect to
hold on to those objects... So, renamed.

 }
 
 bool AwContentBrowserClient::IsFastShutdownPossible() {