Revert of Reland: Geolocation: move from content/browser to device/ (patchset #2 id:20001 of https:…

content/browser/geolocation/location_arbitrator_impl.cc

Index: content/browser/geolocation/location_arbitrator_impl.cc
diff --git a/device/geolocation/location_arbitrator_impl.cc b/content/browser/geolocation/location_arbitrator_impl.cc
similarity index 94%
rename from device/geolocation/location_arbitrator_impl.cc
rename to content/browser/geolocation/location_arbitrator_impl.cc
index d39d3afccd2cfc14ba34f45d9d77e482091b8648..44d911f7aeadfb6078f4623bd193583096a9ab68 100644
--- a/device/geolocation/location_arbitrator_impl.cc
+++ b/content/browser/geolocation/location_arbitrator_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "device/geolocation/location_arbitrator_impl.h"
+#include "content/browser/geolocation/location_arbitrator_impl.h"
 
 #include <map>
 
@@ -10,12 +10,13 @@
 #include "base/bind_helpers.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
-#include "device/geolocation/access_token_store.h"
-#include "device/geolocation/geolocation_delegate.h"
-#include "device/geolocation/network_location_provider.h"
+#include "content/browser/geolocation/network_location_provider.h"
+#include "content/public/browser/access_token_store.h"
+#include "content/public/browser/geolocation_delegate.h"
+#include "content/public/common/content_client.h"
 #include "url/gurl.h"
 
-namespace device {
+namespace content {
 namespace {
 
 const char* kDefaultNetworkProviderUrl =
@@ -171,7 +172,7 @@ LocationArbitratorImpl::NewSystemLocationProvider() {
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
   return nullptr;
 #else
-  return device::NewSystemLocationProvider();
+  return content::NewSystemLocationProvider();
 #endif
 }
 
@@ -209,4 +210,4 @@ bool LocationArbitratorImpl::HasPermissionBeenGranted() const {
   return is_permission_granted_;
 }
 
-}  // namespace device
+}  // namespace content