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

device/geolocation/network_location_provider_unittest.cc

Index: device/geolocation/network_location_provider_unittest.cc
diff --git a/content/browser/geolocation/network_location_provider_unittest.cc b/device/geolocation/network_location_provider_unittest.cc
similarity index 98%
rename from content/browser/geolocation/network_location_provider_unittest.cc
rename to device/geolocation/network_location_provider_unittest.cc
index dfda555d3ff761ae5a0da0276796fd959de4b66a..ff65edff2fa87785383e926514a0dfa1d2bad537 100644
--- a/content/browser/geolocation/network_location_provider_unittest.cc
+++ b/device/geolocation/network_location_provider_unittest.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/network_location_provider.h"
+#include "device/geolocation/network_location_provider.h"
 
 #include <stddef.h>
 
@@ -18,15 +18,15 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "content/browser/geolocation/fake_access_token_store.h"
-#include "content/browser/geolocation/location_arbitrator_impl.h"
-#include "content/browser/geolocation/wifi_data_provider.h"
+#include "device/geolocation/fake_access_token_store.h"
+#include "device/geolocation/location_arbitrator_impl.h"
+#include "device/geolocation/wifi_data_provider.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace content {
+namespace device {
 
 // Constants used in multiple tests.
 const char kTestServerUrl[] = "https://www.geolocation.test/service";
@@ -556,4 +556,4 @@ TEST_F(GeolocationNetworkProviderTest, NetworkPositionCache) {
   }
 }
 
-}  // namespace content
+}  // namespace device