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

device/geolocation/network_location_provider.cc

Index: device/geolocation/network_location_provider.cc
diff --git a/content/browser/geolocation/network_location_provider.cc b/device/geolocation/network_location_provider.cc
similarity index 98%
rename from content/browser/geolocation/network_location_provider.cc
rename to device/geolocation/network_location_provider.cc
index 0c6e6db4c74c94a275935c450ccc8782facf7228..0e2ae184c498f2919957748516dc0c93c196dcc3 100644
--- a/content/browser/geolocation/network_location_provider.cc
+++ b/device/geolocation/network_location_provider.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 "base/bind.h"
 #include "base/location.h"
@@ -10,9 +10,9 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
-#include "content/public/browser/access_token_store.h"
+#include "device/geolocation/access_token_store.h"
 
-namespace content {
+namespace device {
 namespace {
 // The maximum period of time we'll wait for a complete set of wifi data
 // before sending the request.
@@ -270,4 +270,4 @@ bool NetworkLocationProvider::IsStarted() const {
   return wifi_data_provider_manager_ != nullptr;
 }
 
-}  // namespace content
+}  // namespace device