Refactor to make BlimpLocationProvider accessible to content layer.

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 60c9ac57a905d817611ca6e92531187aaa508083..3856dab1eb5268c761338247651f8b4de9286b5e 100644
--- a/content/browser/geolocation/location_arbitrator_impl.h
+++ b/content/browser/geolocation/location_arbitrator_impl.h
@@ -45,7 +45,7 @@ class CONTENT_EXPORT LocationArbitratorImpl : public LocationArbitrator {
   static GURL DefaultNetworkProviderURL();
 
   // LocationArbitrator
-  void StartProviders(bool enable_high_accuracy) override;
+  void StartProviders(bool enable_high_accuracy, bool use_network) override;
   void StopProviders() override;
   void OnPermissionGranted() override;
   bool HasPermissionBeenGranted() const override;
@@ -62,12 +62,14 @@ class CONTENT_EXPORT LocationArbitratorImpl : public LocationArbitrator {
       const GURL& url,
       const base::string16& access_token);
   virtual LocationProvider* NewSystemLocationProvider();
+  virtual LocationProvider* GetOverrideSystemLocationProvider();
   virtual base::Time GetTimeNow() const;
 
  private:
   // Takes ownership of |provider| on entry; it will either be added to
   // |providers_| or deleted on error (e.g. it fails to start).
   void RegisterProvider(LocationProvider* provider);
+  void RegisterSystemProvider();
   void OnAccessTokenStoresLoaded(
       AccessTokenStore::AccessTokenMap access_token_map,
       net::URLRequestContextGetter* context_getter);