Fix crash when permission request received from extension.

BUG=http://crbug.com/37196
TEST=TODO

Review URL: http://codereview.chromium.org/667006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40621 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 3 deletions

diff --git a/chrome/browser/geolocation/location_arbitrator.h b/chrome/browser/geolocation/location_arbitrator.h
index 96e1de2..98477c7 100644
--- a/chrome/browser/geolocation/location_arbitrator.h
+++ b/chrome/browser/geolocation/location_arbitrator.h
@@ -8,6 +8,7 @@
 #include "base/ref_counted.h"
 
 class AccessTokenStore;
+class LocationProviderBase;
 class URLRequestContextGetter;
 struct Geoposition;
 
@@ -62,9 +63,11 @@ class GeolocationArbitrator : public base::RefCounted<GeolocationArbitrator> {
   // via AddObserver(). Returns true if the observer was removed.
   virtual bool RemoveObserver(Delegate* delegate) = 0;
 
-  // TODO(joth): This is a stop-gap for testing; once we have decoupled
-  // provider factory we should extract mock creation from the arbitrator.
-  static void SetUseMockProvider(bool use_mock);
+  // For testing, a factory functino can be set which will be used to create
+  // a specified test provider. Pass NULL to reset to the default behavior.
+  typedef LocationProviderBase* (*LocationProviderFactoryFunction)(void);
+  static void SetProviderFactoryForTest(
+      LocationProviderFactoryFunction factory_function);
 
  protected:
   friend class base::RefCounted<GeolocationArbitrator>;