Geolocation: extract ContentBrowserClient methods specific to Geolocation into a class

android_webview/browser/aw_content_browser_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/aw_content_browser_client.h"
 
 #include <utility>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
@@ skipping 142 matching lines @@
   }
   void SaveAccessToken(const GURL& server_url,
                        const base::string16& access_token) override {}
 
  private:
   ~AwAccessTokenStore() override {}
 
   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
 
 // static
 std::string AwContentBrowserClient::GetAcceptLangsImpl() {
   // Start with the current locale.
   std::string langs = g_locale_manager->GetLocale();
 
   // If we're not en-US, add in en-US which will be
@@ skipping 248 matching lines @@
 }
 
 void AwContentBrowserClient::ResourceDispatcherHostCreated() {
   AwResourceDispatcherHostDelegate::ResourceDispatcherHostCreated();
 }
 
 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() {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kSingleProcess)) {
     NOTREACHED()
         << "Android WebView is single process, so IsFastShutdownPossible"
         << " should never be called";
     return false;
   } else {
@@ skipping 94 matching lines @@
 
 #if defined(VIDEO_HOLE)
 content::ExternalVideoSurfaceContainer*
 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
     content::WebContents* web_contents) {
   return native_factory_->CreateExternalVideoSurfaceContainer(web_contents);
 }
 #endif
 
 }  // namespace android_webview