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

content/browser/geolocation/network_location_request.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef DEVICE_GEOLOCATION_NETWORK_LOCATION_REQUEST_H_
-#define DEVICE_GEOLOCATION_NETWORK_LOCATION_REQUEST_H_
+#ifndef CONTENT_BROWSER_GEOLOCATION_NETWORK_LOCATION_REQUEST_H_
+#define CONTENT_BROWSER_GEOLOCATION_NETWORK_LOCATION_REQUEST_H_
 
 #include <memory>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
-#include "device/geolocation/geolocation_export.h"
-#include "device/geolocation/wifi_data_provider.h"
+#include "content/browser/geolocation/wifi_data_provider.h"
+#include "content/common/content_export.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
 namespace net {
 class URLFetcher;
 class URLRequestContextGetter;
 }
 
-namespace device {
+namespace content {
 struct Geoposition;
 
 // Takes wifi data and sends it to a server to get a position fix.
 // It performs formatting of the request and interpretation of the response.
 class NetworkLocationRequest : private net::URLFetcherDelegate {
  public:
   // ID passed to URLFetcher::Create(). Used for testing.
-  DEVICE_GEOLOCATION_EXPORT static int url_fetcher_id_for_tests;
+  CONTENT_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
   // server or network error - either no response or a 500 error code.
   typedef base::Callback<void(const Geoposition& /* position */,
                               bool /* server_error */,
                               const base::string16& /* access_token */,
                               const WifiData& /* wifi_data */)>
       LocationResponseCallback;
 
@@ skipping 26 matching lines @@
   // when the response arrives.
   WifiData wifi_data_;
   base::Time wifi_timestamp_;
 
   // The start time for the request.
   base::TimeTicks request_start_time_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkLocationRequest);
 };
 
-}  // namespace device
+}  // namespace content
 
-#endif  // DEVICE_GEOLOCATION_NETWORK_LOCATION_REQUEST_H_
+#endif  // CONTENT_BROWSER_GEOLOCATION_NETWORK_LOCATION_REQUEST_H_