Reland 2:Geolocation: move from content/browser to device/

device/geolocation/location_arbitrator_impl.cc

Index: device/geolocation/location_arbitrator_impl.cc
diff --git a/content/browser/geolocation/location_arbitrator_impl.cc b/device/geolocation/location_arbitrator_impl.cc
similarity index 94%
rename from content/browser/geolocation/location_arbitrator_impl.cc
rename to device/geolocation/location_arbitrator_impl.cc
index 44d911f7aeadfb6078f4623bd193583096a9ab68..d39d3afccd2cfc14ba34f45d9d77e482091b8648 100644
--- a/content/browser/geolocation/location_arbitrator_impl.cc
+++ b/device/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 "content/browser/geolocation/location_arbitrator_impl.h"
+#include "device/geolocation/location_arbitrator_impl.h"
 
 #include <map>
 
@@ -10,13 +10,12 @@
 #include "base/bind_helpers.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.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 "device/geolocation/access_token_store.h"
+#include "device/geolocation/geolocation_delegate.h"
+#include "device/geolocation/network_location_provider.h"
 #include "url/gurl.h"
 
-namespace content {
+namespace device {
 namespace {
 
 const char* kDefaultNetworkProviderUrl =
@@ -172,7 +171,7 @@ LocationArbitratorImpl::NewSystemLocationProvider() {
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
   return nullptr;
 #else
-  return content::NewSystemLocationProvider();
+  return device::NewSystemLocationProvider();
 #endif
 }
 
@@ -210,4 +209,4 @@ bool LocationArbitratorImpl::HasPermissionBeenGranted() const {
   return is_permission_granted_;
 }
 
-}  // namespace content
+}  // namespace device