Geolocation: extract ContentBrowserClient methods specific to Geolocation into a class

content/shell/browser/shell_content_browser_client.cc

Index: content/shell/browser/shell_content_browser_client.cc
diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc
index 9d83b1896d3c8dc26e9204ca16a29a6a07f55881..974221e80c11bef12ec37d1d51afdbfcd3e85e23 100644
--- a/content/shell/browser/shell_content_browser_client.cc
+++ b/content/shell/browser/shell_content_browser_client.cc
@@ -118,6 +118,20 @@ int GetCrashSignalFD(const base::CommandLine& command_line) {
 }
 #endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
 
+// A provider of services for Geolocation.
+class ShellGeolocationDelegate : public content::GeolocationProvider::Delegate {

[Michael van Ouwerkerk, 2016/06/28 11:17:08]

nit: DISALLOW_COPY_AND_ASSIGN

[mcasas, 2016/06/28 16:51:26]

Done.

+ public:
+  explicit ShellGeolocationDelegate(ShellBrowserContext* context)
+      : context_(context) {}
+
+  AccessTokenStore* CreateAccessTokenStore() final {
+    return new ShellAccessTokenStore(context_);
+  }
+
+ private:
+  ShellBrowserContext* context_;
+};
+
 }  // namespace
 
 ShellContentBrowserClient* ShellContentBrowserClient::Get() {
@@ -353,8 +367,9 @@ ShellBrowserContext*
   return shell_browser_main_parts_->off_the_record_browser_context();
 }
 
-AccessTokenStore* ShellContentBrowserClient::CreateAccessTokenStore() {
-  return new ShellAccessTokenStore(browser_context());
+GeolocationProvider::Delegate*
+ShellContentBrowserClient::CreateGeolocationDelegate() {
+  return new ShellGeolocationDelegate(browser_context());
 }
 
 }  // namespace content