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

content/browser/geolocation/geolocation_provider_impl.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_GEOLOCATION_PROVIDER_IMPL_H_
-#define DEVICE_GEOLOCATION_GEOLOCATION_PROVIDER_IMPL_H_
+#ifndef CONTENT_BROWSER_GEOLOCATION_GEOLOCATION_PROVIDER_IMPL_H_
+#define CONTENT_BROWSER_GEOLOCATION_GEOLOCATION_PROVIDER_IMPL_H_
 
 #include <list>
 #include <memory>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/threading/thread.h"
-#include "device/geolocation/geolocation_export.h"
-#include "device/geolocation/geolocation_provider.h"
-#include "device/geolocation/geoposition.h"
+#include "content/common/content_export.h"
+#include "content/public/browser/geolocation_provider.h"
+#include "content/public/common/geoposition.h"
 
 namespace base {
 template<typename Type> struct DefaultSingletonTraits;
-class SingleThreadTaskRunner;
 }
 
-namespace device {
+namespace content {
 class LocationArbitrator;
 
-class DEVICE_GEOLOCATION_EXPORT GeolocationProviderImpl
+class CONTENT_EXPORT GeolocationProviderImpl
     : public NON_EXPORTED_BASE(GeolocationProvider),
       public base::Thread {
  public:
   // GeolocationProvider implementation:
   std::unique_ptr<GeolocationProvider::Subscription> AddLocationUpdateCallback(
       const LocationUpdateCallback& callback,
       bool enable_high_accuracy) override;
   void UserDidOptIntoLocationServices() override;
   void OverrideLocationForTesting(const Geoposition& position) override;
 
@@ skipping 49 matching lines @@
 
   bool user_did_opt_into_location_services_;
   Geoposition position_;
 
   // True only in testing, where we want to use a custom position.
   bool ignore_location_updates_;
 
   // Only to be used on the geolocation thread.
   std::unique_ptr<LocationArbitrator> arbitrator_;
 
-  // Used to PostTask()s from the geolocation thread to creation thread.
-  const scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
-
   DISALLOW_COPY_AND_ASSIGN(GeolocationProviderImpl);
 };
 
-}  // namespace device
+}  // namespace content
 
-#endif  // DEVICE_GEOLOCATION_GEOLOCATION_PROVIDER_IMPL_H_
+#endif  // CONTENT_BROWSER_GEOLOCATION_GEOLOCATION_PROVIDER_IMPL_H_