Refactored device status uploading out of policy fetch infrastructure.

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 <deque>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/callback_list.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.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 "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"
 #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 {
 
 // 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.
   typedef base::Callback<void(
       const content::GeolocationProvider::LocationUpdateCallback& callback)>
           LocationUpdateRequester;
 
   using VolumeInfoFetcher = base::Callback<
     std::vector<enterprise_management::VolumeInfo>(
         const std::vector<std::string>& mount_points)>;
 
   // Constructor. Callers can inject their own VolumeInfoFetcher, or if a null
   // callback is passed, the default implementation will be used.
   DeviceStatusCollector(
       PrefService* local_state,
       chromeos::system::StatisticsProvider* provider,
       const LocationUpdateRequester& location_update_requester,
       const VolumeInfoFetcher& volume_info_fetcher);
-  ~DeviceStatusCollector() override;
+  virtual ~DeviceStatusCollector();
 
-  // CloudPolicyClient::StatusProvider:
-  bool GetDeviceStatus(
-      enterprise_management::DeviceStatusReportRequest* status) override;
-  bool GetSessionStatus(
-      enterprise_management::SessionStatusReportRequest* status) override;
-  void OnSubmittedSuccessfully() override;
+  // 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);
 
   // How often, in seconds, to poll to see if the user is idle.
   static const unsigned int kIdlePollIntervalSeconds = 30;
 
   // The total number of CPU samples cached internally.
   static const unsigned int kMaxCPUSamples = 10;
 
  protected:
@@ skipping 145 matching lines @@
       hardware_status_subscription_;
 
   base::WeakPtrFactory<DeviceStatusCollector> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceStatusCollector);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_