Geolocation: move from content/browser to device/

blimp/engine/app/blimp_browser_main_parts.cc

Index: blimp/engine/app/blimp_browser_main_parts.cc
diff --git a/blimp/engine/app/blimp_browser_main_parts.cc b/blimp/engine/app/blimp_browser_main_parts.cc
index d5390e9a9f7815a64a5e9b7be7f1fd6eea95fba6..567c69a84b8c6182b90c2c78b1f079afc3a849b5 100644
--- a/blimp/engine/app/blimp_browser_main_parts.cc
+++ b/blimp/engine/app/blimp_browser_main_parts.cc
@@ -15,9 +15,9 @@
 #include "blimp/engine/session/blimp_engine_session.h"
 #include "blimp/net/blimp_connection.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/geolocation_delegate.h"
-#include "content/public/browser/geolocation_provider.h"
 #include "content/public/common/main_function_params.h"
+#include "device/geolocation/geolocation_delegate.h"
+#include "device/geolocation/geolocation_provider.h"
 #include "net/base/net_module.h"
 #include "net/log/net_log.h"
 
@@ -26,13 +26,13 @@ namespace engine {
 
 namespace {
 // A provider of services needed by Geolocation.
-class BlimpGeolocationDelegate : public content::GeolocationDelegate {
+class BlimpGeolocationDelegate : public device::GeolocationDelegate {
  public:
   BlimpGeolocationDelegate() = default;
 
   bool UseNetworkLocationProviders() final { return false; }
 
-  std::unique_ptr<content::LocationProvider> OverrideSystemLocationProvider()
+  std::unique_ptr<device::LocationProvider> OverrideSystemLocationProvider()
       final {
     return base::WrapUnique(new BlimpLocationProvider());
   }
@@ -65,7 +65,7 @@ void BlimpBrowserMainParts::PreMainMessageLoopRun() {
   settings_manager_.reset(new SettingsManager);
   std::unique_ptr<BlimpBrowserContext> browser_context(
       new BlimpBrowserContext(false, net_log_.get()));
-  content::GeolocationProvider::SetGeolocationDelegate(
+  device::GeolocationProvider::SetGeolocationDelegate(
       new BlimpGeolocationDelegate());
   engine_session_.reset(
       new BlimpEngineSession(std::move(browser_context), net_log_.get(),