1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc
index 03eccb2..1957893 100644
--- a/chrome/browser/geolocation/geolocation_browsertest.cc
+++ b/chrome/browser/geolocation/geolocation_browsertest.cc
@@ -6,6 +6,7 @@
 #include "chrome/browser/app_modal_dialog.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/geolocation/location_arbitrator.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
@@ -69,6 +70,7 @@ class GeolocationBrowserTest : public InProcessBrowserTest {
   };
 
   void Initialize(InitializationOptions options) {
+    GeolocationArbitrator::SetUseMockProvider(true);
     if (!server_.get()) {
       server_ = StartHTTPServer();
     }
@@ -172,6 +174,9 @@ class GeolocationBrowserTest : public InProcessBrowserTest {
     InProcessBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnableGeolocation);
   }
+  virtual void TearDownInProcessBrowserTestFixture() {
+    GeolocationArbitrator::SetUseMockProvider(false);
+  }
 
   scoped_refptr<HTTPTestServer> server_;
   InfoBarDelegate* infobar_;