Geolocation cleanup: make GeolocationDelegate::OverrideSystemLocationProvider return unique_ptr

content/browser/geolocation/location_arbitrator_impl.h

Index: content/browser/geolocation/location_arbitrator_impl.h
diff --git a/content/browser/geolocation/location_arbitrator_impl.h b/content/browser/geolocation/location_arbitrator_impl.h
index c2cbf23e78f2f57117a1fec58596c3407ce73974..a3ccf168e88062675265a111889a37e6e391d23f 100644
--- a/content/browser/geolocation/location_arbitrator_impl.h
+++ b/content/browser/geolocation/location_arbitrator_impl.h
@@ -69,9 +69,9 @@ class CONTENT_EXPORT LocationArbitratorImpl : public LocationArbitrator {
   virtual std::unique_ptr<LocationProvider> NewSystemLocationProvider();
   virtual base::Time GetTimeNow() const;
 
-  GeolocationDelegate* GetDelegateForTesting() { return delegate_; }
-
  private:
+  friend class TestingLocationArbitrator;
+
   // Provider will either be added to |providers_| or
   // deleted on error (e.g. it fails to start).
   void RegisterProvider(std::unique_ptr<LocationProvider> provider);