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

chrome/browser/chromeos/policy/device_status_collector.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 CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_
 
 #include <stdint.h>
 
 #include <deque>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/callback_list.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chromeos/system/version_loader.h"
-#include "device/geolocation/geolocation_provider.h"
-#include "device/geolocation/geoposition.h"
+#include "content/public/browser/geolocation_provider.h"
+#include "content/public/common/geoposition.h"
 #include "policy/proto/device_management_backend.pb.h"
 #include "ui/base/idle/idle.h"
 
 namespace chromeos {
 class CrosSettings;
 namespace system {
 class StatisticsProvider;
 }
 }
 
 namespace content {
 class NotificationDetails;
 class NotificationSource;
 }
 
 class PrefRegistrySimple;
 class PrefService;
 
 namespace policy {
 
 struct DeviceLocalAccount;
 
 // Collects and summarizes the status of an enterprised-managed ChromeOS device.
 class DeviceStatusCollector {
  public:
   // TODO(bartfab): Remove this once crbug.com/125931 is addressed and a proper
   // way to mock geolocation exists.
   typedef base::Callback<void(
-      const device::GeolocationProvider::LocationUpdateCallback& callback)>
-      LocationUpdateRequester;
+      const content::GeolocationProvider::LocationUpdateCallback& callback)>
+          LocationUpdateRequester;
 
   using VolumeInfoFetcher = base::Callback<
     std::vector<enterprise_management::VolumeInfo>(
         const std::vector<std::string>& mount_points)>;
 
   // Reads the first CPU line from /proc/stat. Returns an empty string if
   // the cpu data could not be read. Broken out into a callback to enable
   // mocking for tests.
   //
   // The format of this line from /proc/stat is:
@@ skipping 113 matching lines @@
   bool GetOsUpdateStatus(
       enterprise_management::DeviceStatusReportRequest* request);
   bool GetRunningKioskApp(
       enterprise_management::DeviceStatusReportRequest* request);
 
   // Update the cached values of the reporting settings.
   void UpdateReportingSettings();
 
   void ScheduleGeolocationUpdateRequest();
 
-  // device::GeolocationUpdateCallback implementation.
-  void ReceiveGeolocationUpdate(const device::Geoposition&);
+  // content::GeolocationUpdateCallback implementation.
+  void ReceiveGeolocationUpdate(const content::Geoposition&);
 
   // Callback invoked to update our cached disk information.
   void ReceiveVolumeInfo(
       const std::vector<enterprise_management::VolumeInfo>& info);
 
   // Callback invoked to update our cpu usage information.
   void ReceiveCPUStatistics(const std::string& statistics);
 
   // Callback invoked to update our CPU temp information.
   void StoreCPUTempInfo(
@@ skipping 18 matching lines @@
   // Whether a geolocation update is currently in progress.
   bool geolocation_update_in_progress_ = false;
 
   base::RepeatingTimer idle_poll_timer_;
   base::RepeatingTimer hardware_status_sampling_timer_;
   base::OneShotTimer geolocation_update_timer_;
 
   std::string os_version_;
   std::string firmware_version_;
 
-  device::Geoposition position_;
+  content::Geoposition position_;
 
   // Cached disk volume information.
   std::vector<enterprise_management::VolumeInfo> volume_info_;
 
   // Cached CPU temp information.
   std::vector<enterprise_management::CPUTempInfo> cpu_temp_info_;
 
   struct ResourceUsage {
     // Sample of percentage-of-CPU-used.
     int cpu_usage_percent;
@@ skipping 21 matching lines @@
   chromeos::CrosSettings* const cros_settings_;
 
   // The most recent CPU readings.
   uint64_t last_cpu_active_ = 0;
   uint64_t last_cpu_idle_ = 0;
 
   // TODO(bartfab): Remove this once crbug.com/125931 is addressed and a proper
   // way to mock geolocation exists.
   LocationUpdateRequester location_update_requester_;
 
-  std::unique_ptr<device::GeolocationProvider::Subscription>
+  std::unique_ptr<content::GeolocationProvider::Subscription>
       geolocation_subscription_;
 
   // Cached values of the reporting settings from the device policy.
   bool report_version_info_ = false;
   bool report_activity_times_ = false;
   bool report_boot_mode_ = false;
   bool report_location_ = false;
   bool report_network_interfaces_ = false;
   bool report_users_ = false;
   bool report_hardware_status_ = false;
@@ skipping 23 matching lines @@
       running_kiosk_app_subscription_;
 
   base::WeakPtrFactory<DeviceStatusCollector> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceStatusCollector);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_