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

content/browser/geolocation/location_arbitrator_impl.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 "device/geolocation/location_arbitrator_impl.h"
+#include "content/browser/geolocation/location_arbitrator_impl.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
-#include "device/geolocation/access_token_store.h"
-#include "device/geolocation/geolocation_delegate.h"
-#include "device/geolocation/network_location_provider.h"
+#include "content/browser/geolocation/network_location_provider.h"
+#include "content/public/browser/access_token_store.h"
+#include "content/public/browser/geolocation_delegate.h"
+#include "content/public/common/content_client.h"
 #include "url/gurl.h"
 
-namespace device {
+namespace content {
 namespace {
 
 const char* kDefaultNetworkProviderUrl =
     "https://www.googleapis.com/geolocation/v1/geolocate";
 }  // namespace
 
 // To avoid oscillations, set this to twice the expected update interval of a
 // a GPS-type location provider (in case it misses a beat) plus a little.
 const int64_t LocationArbitratorImpl::kFixStaleTimeoutMilliseconds =
     11 * base::Time::kMillisecondsPerSecond;
@@ skipping 135 matching lines @@
   return base::WrapUnique(new NetworkLocationProvider(
       access_token_store, context, url, access_token));
 #endif
 }
 
 std::unique_ptr<LocationProvider>
 LocationArbitratorImpl::NewSystemLocationProvider() {
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
   return nullptr;
 #else
-  return device::NewSystemLocationProvider();
+  return content::NewSystemLocationProvider();
 #endif
 }
 
 base::Time LocationArbitratorImpl::GetTimeNow() const {
   return base::Time::Now();
 }
 
 bool LocationArbitratorImpl::IsNewPositionBetter(
     const Geoposition& old_position, const Geoposition& new_position,
     bool from_same_provider) const {
@@ skipping 17 matching lines @@
       return true;
     }
   }
   return false;
 }
 
 bool LocationArbitratorImpl::HasPermissionBeenGranted() const {
   return is_permission_granted_;
 }
 
-}  // namespace device
+}  // namespace content