Geolocation: extract ContentBrowserClient methods specific to Geolocation into a class

chrome/browser/chrome_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 "chrome/browser/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 610 matching lines @@
       safe_browsing_ui_manager_->ReportInvalidCertificateChain(
           serialized_report, base::Bind(&base::DoNothing));
     }
   }
 
  private:
   const scoped_refptr<safe_browsing::SafeBrowsingUIManager>
       safe_browsing_ui_manager_;
 };
 
+// A provider of Geolocation services to override AccessTokenStore.
+class ChromeGeolocationServiceOverrides
+    : public content::GeolocationProvider::ServiceOverrides {
+ public:
+  AccessTokenStore* CreateAccessTokenStore() override {
+    return new ChromeAccessTokenStore();
+  }
+};
+
 #if BUILDFLAG(ANDROID_JAVA_UI)
 void HandleSingleTabModeBlockOnUIThread(const BlockedWindowParams& params) {
   WebContents* web_contents = tab_util::GetWebContentsByFrameID(
       params.render_process_id(), params.opener_render_frame_id());
   if (!web_contents)
     return;
 
   SingleTabModeTabHelper::FromWebContents(web_contents)->HandleOpenUrl(params);
 }
 #endif  // BUILDFLAG(ANDROID_JAVA_UI)
@@ skipping 1598 matching lines @@
 
 content::SpeechRecognitionManagerDelegate*
     ChromeContentBrowserClient::CreateSpeechRecognitionManagerDelegate() {
   return new speech::ChromeSpeechRecognitionManagerDelegate();
 }
 
 net::NetLog* ChromeContentBrowserClient::GetNetLog() {
   return g_browser_process->net_log();
 }
 
-AccessTokenStore* ChromeContentBrowserClient::CreateAccessTokenStore() {
-  return new ChromeAccessTokenStore();
+content::GeolocationProvider::ServiceOverrides*
+  ChromeContentBrowserClient::GetGeolocationServiceOverrides() {
+  return new ChromeGeolocationServiceOverrides();
 }
 
 bool ChromeContentBrowserClient::IsFastShutdownPossible() {
   return true;
 }
 
 void ChromeContentBrowserClient::OverrideWebkitPrefs(
     RenderViewHost* rvh, WebPreferences* web_prefs) {
   Profile* profile = Profile::FromBrowserContext(
       rvh->GetProcess()->GetBrowserContext());
@@ skipping 709 matching lines @@
   if (channel <= kMaxDisableEncryptionChannel) {
     static const char* const kWebRtcDevSwitchNames[] = {
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)