Geolocation: extract ContentBrowserClient methods specific to Geolocation into a class

content/public/browser/content_browser_client.h

Index: content/public/browser/content_browser_client.h
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 28ca05b76b47500a9f9207341ac5d476e9a4acd3..548d96b54eabe685614d9eb2f0064adc85abb378 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -18,6 +18,7 @@
 #include "base/values.h"
 #include "build/build_config.h"
 #include "content/public/browser/certificate_request_result_type.h"
+#include "content/public/browser/geolocation_provider.h"
 #include "content/public/browser/navigation_throttle.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/media_stream_request.h"
@@ -531,8 +532,8 @@ class CONTENT_EXPORT ContentBrowserClient {
   // Getters for common objects.
   virtual net::NetLog* GetNetLog();
 
-  // Creates a new AccessTokenStore for gelocation.
-  virtual AccessTokenStore* CreateAccessTokenStore();
+  virtual GeolocationProvider::ServiceOverrides*

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

This method must be documented, like the others in this file.

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

Done.

+  GetGeolocationServiceOverrides();
 
   // Returns true if fast shutdown is possible.
   virtual bool IsFastShutdownPossible();
@@ -622,18 +623,6 @@ class CONTENT_EXPORT ContentBrowserClient {
       const base::FilePath& storage_partition_path,
       ScopedVector<storage::FileSystemBackend>* additional_backends) {}
 
-  // Allows an embedder to return its own LocationProvider implementation.
-  // Return nullptr to use the default one for the platform to be created.
-  // Caller takes ownership of the returned LocationProvider.
-  // FYI: Used by an external project; please don't remove.
-  // Contact Viatcheslav Ostapenko at sl.ostapenko@samsung.com for more
-  // information.
-  virtual LocationProvider* OverrideSystemLocationProvider();
-
-  // Returns true if the location API should use network-based
-  // location approximation in addition to the system provider, if any.
-  virtual bool UseNetworkLocationProviders();
-
   // Creates a new DevToolsManagerDelegate. The caller owns the returned value.
   // It's valid to return nullptr.
   virtual DevToolsManagerDelegate* GetDevToolsManagerDelegate();