Geolocation: extract ContentBrowserClient methods specific to Geolocation into a class

content/shell/browser/shell_content_browser_client.cc

 // Copyright 2013 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 "content/shell/browser/shell_content_browser_client.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/base_switches.h"
@@ skipping 100 matching lines @@
     static breakpad::CrashHandlerHostLinux* crash_handler = NULL;
     if (!crash_handler)
       crash_handler = CreateCrashHandlerHost(process_type);
     return crash_handler->GetDeathSignalSocket();
   }
 
   return -1;
 }
 #endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
 
+// A provider of services for Geolocation.
+class ShellGeolocationServiceOverrides
+    : public content::GeolocationProvider::ServiceOverrides {
+ public:
+  explicit ShellGeolocationServiceOverrides(ShellBrowserContext* context)
+      : context_(context) {}
+  AccessTokenStore* CreateAccessTokenStore() override {
+    return new ShellAccessTokenStore(context_);
+  }
+ private:
+  ShellBrowserContext* context_;
+};
+
 }  // namespace
 
 ShellContentBrowserClient* ShellContentBrowserClient::Get() {
   return g_browser_client;
 }
 
 void ShellContentBrowserClient::SetSwapProcessesForRedirect(bool swap) {
   g_swap_processes_for_redirect = swap;
 }
 
@@ skipping 215 matching lines @@
 
 ShellBrowserContext* ShellContentBrowserClient::browser_context() {
   return shell_browser_main_parts_->browser_context();
 }
 
 ShellBrowserContext*
     ShellContentBrowserClient::off_the_record_browser_context() {
   return shell_browser_main_parts_->off_the_record_browser_context();
 }
 
-AccessTokenStore* ShellContentBrowserClient::CreateAccessTokenStore() {
-  return new ShellAccessTokenStore(browser_context());
+GeolocationProvider::ServiceOverrides*
+ShellContentBrowserClient::GetGeolocationServiceOverrides() {
+  return new ShellGeolocationServiceOverrides(browser_context());
 }
 
 }  // namespace content