chrome/browser/chromeos/policy/device_status_collector.h - Issue 2314813002: Refactored DeviceStatusCollector to enable truely asynchronous status queries

Unified Diff: chrome/browser/chromeos/policy/device_status_collector.h

Issue 2314813002: Refactored DeviceStatusCollector to enable truely asynchronous status queries (Closed)

Patch Set: Rebase Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc ('k') | chrome/browser/chromeos/policy/device_status_collector.cc » ('j') | chrome/browser/chromeos/policy/device_status_collector.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/device_status_collector.h

diff --git a/chrome/browser/chromeos/policy/device_status_collector.h b/chrome/browser/chromeos/policy/device_status_collector.h

index e6f4d1093b34f3900136e66a3cbd740363e6d2d6..f61f44b1c8d13edf165cab9e82d1a92bed903992 100644

--- a/chrome/browser/chromeos/policy/device_status_collector.h

+++ b/chrome/browser/chromeos/policy/device_status_collector.h

@@ -16,17 +16,16 @@

#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/sequenced_task_runner.h"

#include "base/task/cancelable_task_tracker.h"

+#include "base/threading/thread_checker.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 "components/policy/proto/device_management_backend.pb.h"

-#include "content/public/browser/browser_thread.h"

-#include "device/geolocation/geolocation_provider.h"

-#include "device/geolocation/geoposition.h"

#include "ui/base/idle/idle.h"

namespace chromeos {

@@ -47,16 +46,11 @@ class PrefService;

namespace policy {

struct DeviceLocalAccount;

+class GetStatusState;

// 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;

using VolumeInfoFetcher = base::Callback<

std::vector<enterprise_management::VolumeInfo>(

const std::vector<std::string>& mount_points)>;

@@ -74,14 +68,10 @@ class DeviceStatusCollector {

using CPUTempFetcher =

base::Callback<std::vector<enterprise_management::CPUTempInfo>()>;

- // Called in the UI thread after the device status has been collected

- // asynchronously in GetDeviceStatusAsync.

- using DeviceStatusCallback = base::Callback<void(

- std::unique_ptr<enterprise_management::DeviceStatusReportRequest>)>;

- // Called in the UI thread after the device session status has been collected

- // asynchronously in GetDeviceSessionStatusAsync.

- using DeviceSessionStatusCallback = base::Callback<void(

+ // Called in the UI thread after the device and session status have been

+ // collected asynchronously in GetStatusAsync.

Andrew T Wilson (Slow) 2016/09/26 16:33:42 Is GetStatusAsync() even a function any more?

ljusten (tachyonic) 2016/09/27 16:53:55 Thanks, should be GetDeviceAndSessionStatusAsync.

+ using StatusCallback = base::Callback<void(

+ std::unique_ptr<enterprise_management::DeviceStatusReportRequest>,

std::unique_ptr<enterprise_management::SessionStatusReportRequest>)>;

// Constructor. Callers can inject their own VolumeInfoFetcher,

@@ -91,24 +81,15 @@ class DeviceStatusCollector {

DeviceStatusCollector(

PrefService* local_state,

chromeos::system::StatisticsProvider* provider,

- const LocationUpdateRequester& location_update_requester,

const VolumeInfoFetcher& volume_info_fetcher,

const CPUStatisticsFetcher& cpu_statistics_fetcher,

const CPUTempFetcher& cpu_temp_fetcher);

virtual ~DeviceStatusCollector();

- // Gathers device status information and calls the passed response callback.

- // A null pointer passed into the response indicates an error or that

- // device status reporting is disabled.

- virtual void GetDeviceStatusAsync(

- const DeviceStatusCallback& response);

- // Gathers device session status information and calls the passed response

- // callback. A null pointer passed into the response indicates an error or

- // that device session status reporting is disabled or that the active

- // session is not a kiosk session.

- virtual void GetDeviceSessionStatusAsync(

- const DeviceSessionStatusCallback& response);

+ // Gathers device and session status information and calls the passed response

+ // callback. Null pointers passed into the response indicate errors or that

Andrew T Wilson (Slow) 2016/09/26 16:33:42 I think you should document the meaning of null po

ljusten (tachyonic) 2016/09/27 16:53:55 Done.

+ // device or session status reporting is disabled.

+ virtual void GetDeviceAndSessionStatusAsync(const StatusCallback& response);

// Called after the status information has successfully been submitted to

// the server.

@@ -141,9 +122,9 @@ class DeviceStatusCollector {

// Gets the version of the passed app. Virtual to allow mocking.

virtual std::string GetAppVersion(const std::string& app_id);

- // Samples the current hardware status to be sent up with the next device

- // status update.

- void SampleHardwareStatus();

+ // Samples the current hardware resource usage to be sent up with the

+ // next device status update.

+ void SampleResourceUsage();

// The number of days in the past to store device activity.

// This is kept in case device status uploads fail for a number of days.

@@ -168,53 +149,46 @@ class DeviceStatusCollector {

void AddActivePeriod(base::Time start, base::Time end);

- // Clears the cached hardware status.

- void ClearCachedHardwareStatus();

+ // Clears the cached hardware resource usage.

+ void ClearCachedResourceUsage();

// Callbacks from chromeos::VersionLoader.

void OnOSVersion(const std::string& version);

void OnOSFirmware(const std::string& version);

- // Helpers for the various portions of the status. Return true if they

- // actually report any status.

+ void GetDeviceStatus(scoped_refptr<GetStatusState> state);

+ void GetSessionStatus(scoped_refptr<GetStatusState> state);

+ // Helpers for the various portions of DEVICE STATUS. Return true if they

+ // actually report any status. Functions that queue async queries take

+ // a |GetStatusState| instance.

bool GetActivityTimes(