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

device/geolocation/location_arbitrator_impl.h

Index: device/geolocation/location_arbitrator_impl.h
diff --git a/content/browser/geolocation/location_arbitrator_impl.h b/device/geolocation/location_arbitrator_impl.h
similarity index 87%
rename from content/browser/geolocation/location_arbitrator_impl.h
rename to device/geolocation/location_arbitrator_impl.h
index 15902b6528ff1f54f5bdd488f7b62845ffaa894e..f21fb9990a15d167a39b4531db4436efe4c645dd 100644
--- a/content/browser/geolocation/location_arbitrator_impl.h
+++ b/device/geolocation/location_arbitrator_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_
-#define CONTENT_BROWSER_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_
+#ifndef DEVICE_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_
+#define DEVICE_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_
 
 #include <stdint.h>
 #include <vector>
@@ -14,19 +14,19 @@
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
-#include "content/browser/geolocation/location_arbitrator.h"
-#include "content/common/content_export.h"
-#include "content/public/browser/access_token_store.h"
-#include "content/public/browser/geolocation_provider.h"
-#include "content/public/browser/location_provider.h"
-#include "content/public/common/geoposition.h"
+#include "device/geolocation/access_token_store.h"
+#include "device/geolocation/geolocation_export.h"
+#include "device/geolocation/geolocation_provider.h"
+#include "device/geolocation/geoposition.h"
+#include "device/geolocation/location_arbitrator.h"
+#include "device/geolocation/location_provider.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace net {
 class URLRequestContextGetter;
 }
 
-namespace content {
+namespace device {
 class AccessTokenStore;
 class GeolocationDelegate;
 class LocationProvider;
@@ -34,7 +34,8 @@ class LocationProvider;
 // This class is responsible for handling updates from multiple underlying
 // providers and resolving them to a single 'best' location fix at any given
 // moment.
-class CONTENT_EXPORT LocationArbitratorImpl : public LocationArbitrator {
+class DEVICE_GEOLOCATION_EXPORT LocationArbitratorImpl
+    : public LocationArbitrator {
  public:
   // Number of milliseconds newer a location provider has to be that it's worth
   // switching to this location provider on the basis of it being fresher
@@ -123,6 +124,6 @@ class CONTENT_EXPORT LocationArbitratorImpl : public LocationArbitrator {
 // over the platform-dependent implementations.
 std::unique_ptr<LocationProvider> NewSystemLocationProvider();
 
-}  // namespace content
+}  // namespace device
 
-#endif  // CONTENT_BROWSER_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_
+#endif  // DEVICE_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_