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

device/geolocation/network_location_request.h

Index: device/geolocation/network_location_request.h
diff --git a/content/browser/geolocation/network_location_request.h b/device/geolocation/network_location_request.h
similarity index 86%
rename from content/browser/geolocation/network_location_request.h
rename to device/geolocation/network_location_request.h
index 58b892e2d2a14f91a7e6d339f0ddbe9b3f32da7f..5917add8ff7c36d9d6631dca070871dc2c7d5830 100644
--- a/content/browser/geolocation/network_location_request.h
+++ b/device/geolocation/network_location_request.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_NETWORK_LOCATION_REQUEST_H_
-#define CONTENT_BROWSER_GEOLOCATION_NETWORK_LOCATION_REQUEST_H_
+#ifndef DEVICE_GEOLOCATION_NETWORK_LOCATION_REQUEST_H_
+#define DEVICE_GEOLOCATION_NETWORK_LOCATION_REQUEST_H_
 
 #include <memory>
 
@@ -11,8 +11,8 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
-#include "content/browser/geolocation/wifi_data_provider.h"
-#include "content/common/content_export.h"
+#include "device/geolocation/geolocation_export.h"
+#include "device/geolocation/wifi_data_provider.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
@@ -21,7 +21,7 @@ class URLFetcher;
 class URLRequestContextGetter;
 }
 
-namespace content {
+namespace device {
 struct Geoposition;
 
 // Takes wifi data and sends it to a server to get a position fix.
@@ -29,7 +29,7 @@ struct Geoposition;
 class NetworkLocationRequest : private net::URLFetcherDelegate {
  public:
   // ID passed to URLFetcher::Create(). Used for testing.
-  CONTENT_EXPORT static int url_fetcher_id_for_tests;
+  DEVICE_GEOLOCATION_EXPORT static int url_fetcher_id_for_tests;
 
   // Called when a new geo position is available. The second argument indicates
   // whether there was a server error or not. It is true when there was a
@@ -76,6 +76,6 @@ class NetworkLocationRequest : private net::URLFetcherDelegate {
   DISALLOW_COPY_AND_ASSIGN(NetworkLocationRequest);
 };
 
-}  // namespace content
+}  // namespace device
 
-#endif  // CONTENT_BROWSER_GEOLOCATION_NETWORK_LOCATION_REQUEST_H_
+#endif  // DEVICE_GEOLOCATION_NETWORK_LOCATION_REQUEST_H_