Geolocation: extract ContentBrowserClient methods specific to Geolocation into a class

content/browser/geolocation/geolocation_provider_impl.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 "content/browser/geolocation/geolocation_provider_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
 #include "base/single_thread_task_runner.h"
 #include "content/browser/geolocation/location_arbitrator_impl.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/browser_thread.h"

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

nit: delete this duplicated include

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

Done.

+#include "content/public/browser/content_browser_client.h"
 
 namespace content {
 
 GeolocationProvider* GeolocationProvider::GetInstance() {
   return GeolocationProviderImpl::GetInstance();
 }
 
 std::unique_ptr<GeolocationProvider::Subscription>
 GeolocationProviderImpl::AddLocationUpdateCallback(
     const LocationUpdateCallback& callback,
@@ skipping 140 matching lines @@
 
 void GeolocationProviderImpl::CleanUp() {
   DCHECK(OnGeolocationThread());
   arbitrator_.reset();
 }
 
 std::unique_ptr<LocationArbitrator>
 GeolocationProviderImpl::CreateArbitrator() {
   LocationArbitratorImpl::LocationUpdateCallback callback = base::Bind(
       &GeolocationProviderImpl::OnLocationUpdate, base::Unretained(this));
-  return base::WrapUnique(new LocationArbitratorImpl(callback));
+
+  // Use the embedder for service overrides or fall back to the default ones.
+  GeolocationProvider::ServiceOverrides* service_overrides =
+      GetContentClient()->browser()->GetGeolocationServiceOverrides();
+  if (!service_overrides)
+    service_overrides = new GeolocationProvider::ServiceOverrides;
+
+  return base::WrapUnique(
+      new LocationArbitratorImpl(callback, service_overrides));
 }
 
 }  // namespace content