Refactored device status uploading out of policy fetch infrastructure.

chrome/browser/chromeos/policy/device_status_collector.h

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 0780cff0cc9e6dfa7deae361aceaf7c8ac4b56ff..878209fbb2b4c9b64a70870659266adebf16dba0 100644
--- a/chrome/browser/chromeos/policy/device_status_collector.h
+++ b/chrome/browser/chromeos/policy/device_status_collector.h
@@ -21,7 +21,6 @@
 #include "base/timer/timer.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chromeos/system/version_loader.h"
-#include "components/policy/core/common/cloud/cloud_policy_client.h"
 #include "content/public/browser/geolocation_provider.h"
 #include "content/public/common/geoposition.h"
 #include "policy/proto/device_management_backend.pb.h"
@@ -45,7 +44,7 @@ class PrefService;
 namespace policy {
 
 // Collects and summarizes the status of an enterprised-managed ChromeOS device.
-class DeviceStatusCollector : public CloudPolicyClient::StatusProvider {
+class DeviceStatusCollector {
  public:
   // TODO(bartfab): Remove this once crbug.com/125931 is addressed and a proper
   // way to mock geolocation exists.
@@ -64,14 +63,23 @@ class DeviceStatusCollector : public CloudPolicyClient::StatusProvider {
       chromeos::system::StatisticsProvider* provider,
       const LocationUpdateRequester& location_update_requester,
       const VolumeInfoFetcher& volume_info_fetcher);
-  ~DeviceStatusCollector() override;
-
-  // CloudPolicyClient::StatusProvider:
-  bool GetDeviceStatus(
-      enterprise_management::DeviceStatusReportRequest* status) override;
-  bool GetSessionStatus(
-      enterprise_management::SessionStatusReportRequest* status) override;
-  void OnSubmittedSuccessfully() override;
+  virtual ~DeviceStatusCollector();
+
+  // Fills in the passed proto with device status information. Will return
+  // false if no status information is filled in (because status reporting
+  // is disabled).
+  virtual bool GetDeviceStatus(
+      enterprise_management::DeviceStatusReportRequest* status);
+
+  // Fills in the passed proto with session status information. Will return
+  // false if no status information is filled in (because status reporting
+  // is disabled, or because there is no active kiosk session).
+  virtual bool GetSessionStatus(
+      enterprise_management::SessionStatusReportRequest* status);

[Mattias Nissler (ping if slow), 2015/01/23 13:46:34]

I don't think we're using this at all, remove?

[Andrew T Wilson (Slow), 2015/01/23 19:16:18]

We are using this. DeviceStatusCollector currently doesn't fill it in, but I
have a CL in progress to fill it in. Doesn't make sense to remove this existing
API only to re-add it in the next CL.

[Mattias Nissler (ping if slow), 2015/01/26 10:37:01]

So the idea was that SessionStatusReportRequest would only ever be used with
user policy registrations. The lines are a bit blurred for Kiosk Apps and Public
Sessions, but these do have their separate CloudPolicyClients as well - probably
makes more sense to hook up session reporting there, in particular in case we
ever want to reuse some reporting for regular sessions as well. Btw. - what data
is going to be uploaded in session status?

[Andrew T Wilson (Slow), 2015/01/28 13:19:11]

Per our discussion with Jin & Bin, I'm going to continue to upload device-level
sessions (public + kiosk) with the device status. We'll upload user session info
via a separate request if/when we add that functionality.

+
+  // Called after the status information has successfully been submitted to
+  // the server.
+  void OnSubmittedSuccessfully();
 
   static void RegisterPrefs(PrefRegistrySimple* registry);