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

device/geolocation/network_location_provider.cc

 // 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.
 
-#include "content/browser/geolocation/network_location_provider.h"
+#include "device/geolocation/network_location_provider.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #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.
 const int kDataCompleteWaitSeconds = 2;
 }  // namespace
 
 // static
 const size_t NetworkLocationProvider::PositionCache::kMaximumSize = 10;
 
 NetworkLocationProvider::PositionCache::PositionCache() {}
@@ skipping 237 matching lines @@
                 "with new data. Wifi APs: "
              << wifi_data_.access_point_data.size();
   }
   request_->MakeRequest(access_token_, wifi_data_, wifi_timestamp_);
 }
 
 bool NetworkLocationProvider::IsStarted() const {
   return wifi_data_provider_manager_ != nullptr;
 }
 
-}  // namespace content
+}  // namespace device