Geolocation: extract ContentBrowserClient methods specific to Geolocation into a class

content/browser/geolocation/geolocation_provider_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_GEOLOCATION_GEOLOCATION_PROVIDER_IMPL_H_
 #define CONTENT_BROWSER_GEOLOCATION_GEOLOCATION_PROVIDER_IMPL_H_
 
 #include <list>
 #include <memory>
 #include <vector>
@@ skipping 73 matching lines @@
 
   base::CallbackList<void(const Geoposition&)> high_accuracy_callbacks_;
   base::CallbackList<void(const Geoposition&)> low_accuracy_callbacks_;
 
   bool user_did_opt_into_location_services_;
   Geoposition position_;
 
   // True only in testing, where we want to use a custom position.
   bool ignore_location_updates_;
 
+  // The system provided Delegate for the |arbitrator_|.
+  std::unique_ptr<GeolocationProvider::Delegate> delegate_;
+
   // Only to be used on the geolocation thread.
   std::unique_ptr<LocationArbitrator> arbitrator_;
 
   DISALLOW_COPY_AND_ASSIGN(GeolocationProviderImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GEOLOCATION_GEOLOCATION_PROVIDER_IMPL_H_